michael@0: diff --git a/gfx/skia/include/core/SkAdvancedTypefaceMetrics.h b/gfx/skia/include/core/SkAdvancedTypefaceMetrics.h
michael@0: --- a/gfx/skia/include/core/SkAdvancedTypefaceMetrics.h
michael@0: +++ b/gfx/skia/include/core/SkAdvancedTypefaceMetrics.h
michael@0: @@ -29,17 +29,17 @@ public:
michael@0:      SkString fFontName;
michael@0:  
michael@0:      enum FontType {
michael@0:          kType1_Font,
michael@0:          kType1CID_Font,
michael@0:          kCFF_Font,
michael@0:          kTrueType_Font,
michael@0:          kOther_Font,
michael@0: -        kNotEmbeddable_Font,
michael@0: +        kNotEmbeddable_Font
michael@0:      };
michael@0:      // The type of the underlying font program.  This field determines which
michael@0:      // of the following fields are valid.  If it is kOther_Font or
michael@0:      // kNotEmbeddable_Font, the per glyph information will never be populated.
michael@0:      FontType fType;
michael@0:  
michael@0:      // fMultiMaster may be true for Type1_Font or CFF_Font.
michael@0:      bool fMultiMaster;
michael@0: @@ -51,17 +51,17 @@ public:
michael@0:          kFixedPitch_Style  = 0x00001,
michael@0:          kSerif_Style       = 0x00002,
michael@0:          kSymbolic_Style    = 0x00004,
michael@0:          kScript_Style      = 0x00008,
michael@0:          kNonsymbolic_Style = 0x00020,
michael@0:          kItalic_Style      = 0x00040,
michael@0:          kAllCaps_Style     = 0x10000,
michael@0:          kSmallCaps_Style   = 0x20000,
michael@0: -        kForceBold_Style   = 0x40000,
michael@0: +        kForceBold_Style   = 0x40000
michael@0:      };
michael@0:      uint16_t fStyle;        // Font style characteristics.
michael@0:      int16_t fItalicAngle;   // Counterclockwise degrees from vertical of the
michael@0:                              // dominant vertical stroke for an Italic face.
michael@0:      // The following fields are all in font units.
michael@0:      int16_t fAscent;       // Max height above baseline, not including accents.
michael@0:      int16_t fDescent;      // Max depth below baseline (negative).
michael@0:      int16_t fStemV;        // Thickness of dominant vertical stem.
michael@0: @@ -70,26 +70,26 @@ public:
michael@0:      SkIRect fBBox;  // The bounding box of all glyphs (in font units).
michael@0:  
michael@0:      // The type of advance data wanted.
michael@0:      enum PerGlyphInfo {
michael@0:        kNo_PerGlyphInfo         = 0x0, // Don't populate any per glyph info.
michael@0:        kHAdvance_PerGlyphInfo   = 0x1, // Populate horizontal advance data.
michael@0:        kVAdvance_PerGlyphInfo   = 0x2, // Populate vertical advance data.
michael@0:        kGlyphNames_PerGlyphInfo = 0x4, // Populate glyph names (Type 1 only).
michael@0: -      kToUnicode_PerGlyphInfo  = 0x8, // Populate ToUnicode table, ignored
michael@0: +      kToUnicode_PerGlyphInfo  = 0x8  // Populate ToUnicode table, ignored
michael@0:                                        // for Type 1 fonts
michael@0:      };
michael@0:  
michael@0:      template <typename Data>
michael@0:      struct AdvanceMetric {
michael@0:          enum MetricType {
michael@0:              kDefault,  // Default advance: fAdvance.count = 1
michael@0:              kRange,    // Advances for a range: fAdvance.count = fEndID-fStartID
michael@0: -            kRun,      // fStartID-fEndID have same advance: fAdvance.count = 1
michael@0: +            kRun       // fStartID-fEndID have same advance: fAdvance.count = 1
michael@0:          };
michael@0:          MetricType fType;
michael@0:          uint16_t fStartId;
michael@0:          uint16_t fEndId;
michael@0:          SkTDArray<Data> fAdvance;
michael@0:          SkTScopedPtr<AdvanceMetric<Data> > fNext;
michael@0:      };
michael@0:  
michael@0: diff --git a/gfx/skia/include/core/SkBlitRow.h b/gfx/skia/include/core/SkBlitRow.h
michael@0: --- a/gfx/skia/include/core/SkBlitRow.h
michael@0: +++ b/gfx/skia/include/core/SkBlitRow.h
michael@0: @@ -44,17 +44,17 @@ public:
michael@0:  
michael@0:      //! Public entry-point to return a blit function ptr
michael@0:      static Proc Factory(unsigned flags, SkBitmap::Config);
michael@0:  
michael@0:      ///////////// D32 version
michael@0:  
michael@0:      enum Flags32 {
michael@0:          kGlobalAlpha_Flag32     = 1 << 0,
michael@0: -        kSrcPixelAlpha_Flag32   = 1 << 1,
michael@0: +        kSrcPixelAlpha_Flag32   = 1 << 1
michael@0:      };
michael@0:  
michael@0:      /** Function pointer that blends 32bit colors onto a 32bit destination.
michael@0:          @param dst  array of dst 32bit colors
michael@0:          @param src  array of src 32bit colors (w/ or w/o alpha)
michael@0:          @param count number of colors to blend
michael@0:          @param alpha global alpha to be applied to all src colors
michael@0:       */
michael@0: diff --git a/gfx/skia/include/core/SkCanvas.h b/gfx/skia/include/core/SkCanvas.h
michael@0: --- a/gfx/skia/include/core/SkCanvas.h
michael@0: +++ b/gfx/skia/include/core/SkCanvas.h
michael@0: @@ -132,17 +132,17 @@ public:
michael@0:           * low byte to high byte: B, G, R, A.
michael@0:           */
michael@0:          kBGRA_Premul_Config8888,
michael@0:          kBGRA_Unpremul_Config8888,
michael@0:          /**
michael@0:           * low byte to high byte: R, G, B, A.
michael@0:           */
michael@0:          kRGBA_Premul_Config8888,
michael@0: -        kRGBA_Unpremul_Config8888,
michael@0: +        kRGBA_Unpremul_Config8888
michael@0:      };
michael@0:  
michael@0:      /**
michael@0:       *  On success (returns true), copy the canvas pixels into the bitmap.
michael@0:       *  On failure, the bitmap parameter is left unchanged and false is
michael@0:       *  returned.
michael@0:       *
michael@0:       *  The canvas' pixels are converted to the bitmap's config. The only
michael@0: diff --git a/gfx/skia/include/core/SkDevice.h b/gfx/skia/include/core/SkDevice.h
michael@0: --- a/gfx/skia/include/core/SkDevice.h
michael@0: +++ b/gfx/skia/include/core/SkDevice.h
michael@0: @@ -134,17 +134,17 @@ public:
michael@0:       *  Return the device's origin: its offset in device coordinates from
michael@0:       *  the default origin in its canvas' matrix/clip
michael@0:       */
michael@0:      const SkIPoint& getOrigin() const { return fOrigin; }
michael@0:  
michael@0:  protected:
michael@0:      enum Usage {
michael@0:         kGeneral_Usage,
michael@0: -       kSaveLayer_Usage, // <! internal use only
michael@0: +       kSaveLayer_Usage // <! internal use only
michael@0:      };
michael@0:  
michael@0:      struct TextFlags {
michael@0:          uint32_t            fFlags;     // SkPaint::getFlags()
michael@0:          SkPaint::Hinting    fHinting;
michael@0:      };
michael@0:  
michael@0:      /**
michael@0: diff --git a/gfx/skia/include/core/SkFlattenable.h b/gfx/skia/include/core/SkFlattenable.h
michael@0: --- a/gfx/skia/include/core/SkFlattenable.h
michael@0: +++ b/gfx/skia/include/core/SkFlattenable.h
michael@0: @@ -216,17 +216,17 @@ public:
michael@0:      SkFactorySet* setFactoryRecorder(SkFactorySet*);
michael@0:  
michael@0:      enum Flags {
michael@0:          kCrossProcess_Flag       = 0x01,
michael@0:          /**
michael@0:           *  Instructs the writer to inline Factory names as there are seen the
michael@0:           *  first time (after that we store an index). The pipe code uses this.
michael@0:           */
michael@0: -        kInlineFactoryNames_Flag = 0x02,
michael@0: +        kInlineFactoryNames_Flag = 0x02
michael@0:      };
michael@0:      Flags getFlags() const { return (Flags)fFlags; }
michael@0:      void setFlags(Flags flags) { fFlags = flags; }
michael@0:      
michael@0:      bool isCrossProcess() const {
michael@0:          return SkToBool(fFlags & kCrossProcess_Flag);
michael@0:      }
michael@0:      bool inlineFactoryNames() const {
michael@0: diff --git a/gfx/skia/include/core/SkFontHost.h b/gfx/skia/include/core/SkFontHost.h
michael@0: --- a/gfx/skia/include/core/SkFontHost.h
michael@0: +++ b/gfx/skia/include/core/SkFontHost.h
michael@0: @@ -245,17 +245,17 @@ public:
michael@0:          vertically. When rendering subpixel glyphs we need to know which way
michael@0:          round they are.
michael@0:  
michael@0:          Note, if you change this after startup, you'll need to flush the glyph
michael@0:          cache because it'll have the wrong type of masks cached.
michael@0:      */
michael@0:      enum LCDOrientation {
michael@0:          kHorizontal_LCDOrientation = 0,    //!< this is the default
michael@0: -        kVertical_LCDOrientation   = 1,
michael@0: +        kVertical_LCDOrientation   = 1
michael@0:      };
michael@0:  
michael@0:      static void SetSubpixelOrientation(LCDOrientation orientation);
michael@0:      static LCDOrientation GetSubpixelOrientation();
michael@0:  
michael@0:      /** LCD color elements can vary in order. For subpixel text we need to know
michael@0:          the order which the LCDs uses so that the color fringes are in the
michael@0:          correct place.
michael@0: @@ -264,17 +264,17 @@ public:
michael@0:          cache because it'll have the wrong type of masks cached.
michael@0:  
michael@0:          kNONE_LCDOrder means that the subpixel elements are not spatially
michael@0:          separated in any usable fashion.
michael@0:       */
michael@0:      enum LCDOrder {
michael@0:          kRGB_LCDOrder = 0,    //!< this is the default
michael@0:          kBGR_LCDOrder = 1,
michael@0: -        kNONE_LCDOrder = 2,
michael@0: +        kNONE_LCDOrder = 2
michael@0:      };
michael@0:  
michael@0:      static void SetSubpixelOrder(LCDOrder order);
michael@0:      static LCDOrder GetSubpixelOrder();
michael@0:  
michael@0:  #ifdef SK_BUILD_FOR_ANDROID
michael@0:      ///////////////////////////////////////////////////////////////////////////
michael@0:  
michael@0: diff --git a/gfx/skia/include/core/SkMaskFilter.h b/gfx/skia/include/core/SkMaskFilter.h
michael@0: --- a/gfx/skia/include/core/SkMaskFilter.h
michael@0: +++ b/gfx/skia/include/core/SkMaskFilter.h
michael@0: @@ -57,17 +57,17 @@ public:
michael@0:  
michael@0:      virtual void flatten(SkFlattenableWriteBuffer& ) {}
michael@0:  
michael@0:      enum BlurType {
michael@0:          kNone_BlurType,    //!< this maskfilter is not a blur
michael@0:          kNormal_BlurType,  //!< fuzzy inside and outside
michael@0:          kSolid_BlurType,   //!< solid inside, fuzzy outside
michael@0:          kOuter_BlurType,   //!< nothing inside, fuzzy outside
michael@0: -        kInner_BlurType,   //!< fuzzy inside, nothing outside
michael@0: +        kInner_BlurType    //!< fuzzy inside, nothing outside
michael@0:      };
michael@0:  
michael@0:      struct BlurInfo {
michael@0:          SkScalar fRadius;
michael@0:          bool     fIgnoreTransform;
michael@0:          bool     fHighQuality;
michael@0:      };
michael@0:  
michael@0: diff --git a/gfx/skia/include/core/SkPaint.h b/gfx/skia/include/core/SkPaint.h
michael@0: --- a/gfx/skia/include/core/SkPaint.h
michael@0: +++ b/gfx/skia/include/core/SkPaint.h
michael@0: @@ -70,17 +70,17 @@ public:
michael@0:             kFull_Hinting   -> <same as kNormalHinting, unless we are rendering
michael@0:                                subpixel glyphs, in which case TARGET_LCD or
michael@0:                                TARGET_LCD_V is used>
michael@0:      */
michael@0:      enum Hinting {
michael@0:          kNo_Hinting            = 0,
michael@0:          kSlight_Hinting        = 1,
michael@0:          kNormal_Hinting        = 2,     //!< this is the default
michael@0: -        kFull_Hinting          = 3,
michael@0: +        kFull_Hinting          = 3
michael@0:      };
michael@0:  
michael@0:      Hinting getHinting() const {
michael@0:          return static_cast<Hinting>(fHinting);
michael@0:      }
michael@0:  
michael@0:      void setHinting(Hinting hintingLevel);
michael@0:  
michael@0: @@ -282,17 +282,17 @@ public:
michael@0:          results may not appear the same as if it was drawn twice, filled and
michael@0:          then stroked.
michael@0:      */
michael@0:      enum Style {
michael@0:          kFill_Style,            //!< fill the geometry
michael@0:          kStroke_Style,          //!< stroke the geometry
michael@0:          kStrokeAndFill_Style,   //!< fill and stroke the geometry
michael@0:  
michael@0: -        kStyleCount,
michael@0: +        kStyleCount
michael@0:      };
michael@0:  
michael@0:      /** Return the paint's style, used for controlling how primitives'
michael@0:          geometries are interpreted (except for drawBitmap, which always assumes
michael@0:          kFill_Style).
michael@0:          @return the paint's Style
michael@0:      */
michael@0:      Style getStyle() const { return (Style)fStyle; }
michael@0: diff --git a/gfx/skia/include/core/SkScalerContext.h b/gfx/skia/include/core/SkScalerContext.h
michael@0: --- a/gfx/skia/include/core/SkScalerContext.h
michael@0: +++ b/gfx/skia/include/core/SkScalerContext.h
michael@0: @@ -172,24 +172,24 @@ public:
michael@0:          kHintingBit2_Flag         = 0x0100,
michael@0:  
michael@0:          // these should only ever be set if fMaskFormat is LCD16 or LCD32
michael@0:          kLCD_Vertical_Flag        = 0x0200,    // else Horizontal
michael@0:          kLCD_BGROrder_Flag        = 0x0400,    // else RGB order
michael@0:  
michael@0:          // luminance : 0 for black text, kLuminance_Max for white text
michael@0:          kLuminance_Shift          = 11, // to shift into the other flags above
michael@0: -        kLuminance_Bits           = 3,  // ensure Flags doesn't exceed 16bits
michael@0: +        kLuminance_Bits           = 3  // ensure Flags doesn't exceed 16bits
michael@0:      };
michael@0:      
michael@0:      // computed values
michael@0:      enum {
michael@0:          kHinting_Mask   = kHintingBit1_Flag | kHintingBit2_Flag,
michael@0:          kLuminance_Max  = (1 << kLuminance_Bits) - 1,
michael@0: -        kLuminance_Mask = kLuminance_Max << kLuminance_Shift,
michael@0: +        kLuminance_Mask = kLuminance_Max << kLuminance_Shift
michael@0:      };
michael@0:  
michael@0:      struct Rec {
michael@0:          uint32_t    fOrigFontID;
michael@0:          uint32_t    fFontID;
michael@0:          SkScalar    fTextSize, fPreScaleX, fPreSkewX;
michael@0:          SkScalar    fPost2x2[2][2];
michael@0:          SkScalar    fFrameWidth, fMiterLimit;
michael@0: diff --git a/gfx/skia/include/core/SkTypes.h b/gfx/skia/include/core/SkTypes.h
michael@0: --- a/gfx/skia/include/core/SkTypes.h
michael@0: +++ b/gfx/skia/include/core/SkTypes.h
michael@0: @@ -433,17 +433,17 @@ public:
michael@0:           */
michael@0:          kAlloc_OnShrink,
michael@0:          
michael@0:          /**
michael@0:           *  If the requested size is smaller than the current size, and the
michael@0:           *  current block is dynamically allocated, just return the old
michael@0:           *  block.
michael@0:           */
michael@0: -        kReuse_OnShrink,
michael@0: +        kReuse_OnShrink
michael@0:      };
michael@0:  
michael@0:      /**
michael@0:       *  Reallocates the block to a new size. The ptr may or may not change.
michael@0:       */
michael@0:      void* reset(size_t size, OnShrink shrink = kAlloc_OnShrink) {
michael@0:          if (size == fSize || (kReuse_OnShrink == shrink && size < fSize)) {
michael@0:              return fPtr;
michael@0: diff --git a/gfx/skia/include/effects/SkLayerDrawLooper.h b/gfx/skia/include/effects/SkLayerDrawLooper.h
michael@0: --- a/gfx/skia/include/effects/SkLayerDrawLooper.h
michael@0: +++ b/gfx/skia/include/effects/SkLayerDrawLooper.h
michael@0: @@ -36,17 +36,17 @@ public:
michael@0:          
michael@0:          /**
michael@0:           *  Use the layer's paint entirely, with these exceptions:
michael@0:           *  - We never override the draw's paint's text_encoding, since that is
michael@0:           *    used to interpret the text/len parameters in draw[Pos]Text.
michael@0:           *  - Flags and Color are always computed using the LayerInfo's
michael@0:           *    fFlagsMask and fColorMode.
michael@0:           */
michael@0: -        kEntirePaint_Bits = -1,
michael@0: +        kEntirePaint_Bits = -1
michael@0:          
michael@0:      };
michael@0:      typedef int32_t BitFlags;
michael@0:  
michael@0:      /**
michael@0:       *  Info for how to apply the layer's paint and offset.
michael@0:       *
michael@0:       *  fFlagsMask selects which flags in the layer's paint should be applied.
michael@0: diff --git a/gfx/skia/src/core/SkBitmap.cpp b/gfx/skia/src/core/SkBitmap.cpp
michael@0: --- a/gfx/skia/src/core/SkBitmap.cpp
michael@0: +++ b/gfx/skia/src/core/SkBitmap.cpp
michael@0: @@ -1357,17 +1357,17 @@ bool SkBitmap::extractAlpha(SkBitmap* ds
michael@0:  
michael@0:  ///////////////////////////////////////////////////////////////////////////////
michael@0:  
michael@0:  enum {
michael@0:      SERIALIZE_PIXELTYPE_NONE,
michael@0:      SERIALIZE_PIXELTYPE_RAW_WITH_CTABLE,
michael@0:      SERIALIZE_PIXELTYPE_RAW_NO_CTABLE,
michael@0:      SERIALIZE_PIXELTYPE_REF_DATA,
michael@0: -    SERIALIZE_PIXELTYPE_REF_PTR,
michael@0: +    SERIALIZE_PIXELTYPE_REF_PTR
michael@0:  };
michael@0:  
michael@0:  static void writeString(SkFlattenableWriteBuffer& buffer, const char str[]) {
michael@0:      size_t len = strlen(str);
michael@0:      buffer.write32(len);
michael@0:      buffer.writePad(str, len);
michael@0:  }
michael@0:  
michael@0: diff --git a/gfx/skia/src/core/SkMatrix.cpp b/gfx/skia/src/core/SkMatrix.cpp
michael@0: --- a/gfx/skia/src/core/SkMatrix.cpp
michael@0: +++ b/gfx/skia/src/core/SkMatrix.cpp
michael@0: @@ -1715,17 +1715,17 @@ SkScalar SkMatrix::getMaxStretch() const
michael@0:  const SkMatrix& SkMatrix::I() {
michael@0:      static SkMatrix gIdentity;
michael@0:      static bool gOnce;
michael@0:      if (!gOnce) {
michael@0:          gIdentity.reset();
michael@0:          gOnce = true;
michael@0:      }
michael@0:      return gIdentity;
michael@0: -};
michael@0: +}
michael@0:  
michael@0:  const SkMatrix& SkMatrix::InvalidMatrix() {
michael@0:      static SkMatrix gInvalid;
michael@0:      static bool gOnce;
michael@0:      if (!gOnce) {
michael@0:          gInvalid.setAll(SK_ScalarMax, SK_ScalarMax, SK_ScalarMax,
michael@0:                          SK_ScalarMax, SK_ScalarMax, SK_ScalarMax,
michael@0:                          SK_ScalarMax, SK_ScalarMax, SK_ScalarMax);