michael@0: From 81d61682a94d47be5b47fb7882ea7e7c7e6c3351 Mon Sep 17 00:00:00 2001
michael@0: From: George Wright <gwright@mozilla.com>
michael@0: Date: Fri, 18 May 2012 14:15:28 -0400
michael@0: Subject: [PATCH 04/10]     Bug 755869 - [7] Re-apply bug 722011 - Fix
michael@0:  trailing commas at end of enum lists r=mattwoodrow
michael@0: 
michael@0: ---
michael@0:  gfx/skia/include/core/SkAdvancedTypefaceMetrics.h |    8 ++++----
michael@0:  gfx/skia/include/core/SkBlitRow.h                 |    2 +-
michael@0:  gfx/skia/include/core/SkCanvas.h                  |    2 +-
michael@0:  gfx/skia/include/core/SkDevice.h                  |    2 +-
michael@0:  gfx/skia/include/core/SkDeviceProfile.h           |    4 ++--
michael@0:  gfx/skia/include/core/SkFlattenable.h             |    2 +-
michael@0:  gfx/skia/include/core/SkFontHost.h                |    4 ++--
michael@0:  gfx/skia/include/core/SkMaskFilter.h              |    2 +-
michael@0:  gfx/skia/include/core/SkPaint.h                   |    4 ++--
michael@0:  gfx/skia/include/core/SkScalerContext.h           |    9 +++++----
michael@0:  gfx/skia/include/core/SkTypes.h                   |    2 +-
michael@0:  gfx/skia/include/effects/SkLayerDrawLooper.h      |    2 +-
michael@0:  gfx/skia/src/core/SkBitmap.cpp                    |    2 +-
michael@0:  gfx/skia/src/core/SkGlyphCache.cpp                |    2 +-
michael@0:  14 files changed, 24 insertions(+), 23 deletions(-)
michael@0: 
michael@0: diff --git a/gfx/skia/include/core/SkAdvancedTypefaceMetrics.h b/gfx/skia/include/core/SkAdvancedTypefaceMetrics.h
michael@0: index 09fc9a9..5ffdb45 100644
michael@0: --- a/gfx/skia/include/core/SkAdvancedTypefaceMetrics.h
michael@0: +++ b/gfx/skia/include/core/SkAdvancedTypefaceMetrics.h
michael@0: @@ -34,7 +34,7 @@ public:
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: @@ -56,7 +56,7 @@ public:
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: @@ -75,7 +75,7 @@ public:
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: @@ -84,7 +84,7 @@ public:
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: diff --git a/gfx/skia/include/core/SkBlitRow.h b/gfx/skia/include/core/SkBlitRow.h
michael@0: index 973ab4c..febc405 100644
michael@0: --- a/gfx/skia/include/core/SkBlitRow.h
michael@0: +++ b/gfx/skia/include/core/SkBlitRow.h
michael@0: @@ -42,7 +42,7 @@ public:
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: diff --git a/gfx/skia/include/core/SkCanvas.h b/gfx/skia/include/core/SkCanvas.h
michael@0: index 25cc94a..d942783 100644
michael@0: --- a/gfx/skia/include/core/SkCanvas.h
michael@0: +++ b/gfx/skia/include/core/SkCanvas.h
michael@0: @@ -148,7 +148,7 @@ public:
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: diff --git a/gfx/skia/include/core/SkDevice.h b/gfx/skia/include/core/SkDevice.h
michael@0: index 1e4e0a3..b4d44bf 100644
michael@0: --- a/gfx/skia/include/core/SkDevice.h
michael@0: +++ b/gfx/skia/include/core/SkDevice.h
michael@0: @@ -139,7 +139,7 @@ public:
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: diff --git a/gfx/skia/include/core/SkDeviceProfile.h b/gfx/skia/include/core/SkDeviceProfile.h
michael@0: index 46b9781..f6a0bca 100644
michael@0: --- a/gfx/skia/include/core/SkDeviceProfile.h
michael@0: +++ b/gfx/skia/include/core/SkDeviceProfile.h
michael@0: @@ -17,7 +17,7 @@ public:
michael@0:          kRGB_Horizontal_LCDConfig,
michael@0:          kBGR_Horizontal_LCDConfig,
michael@0:          kRGB_Vertical_LCDConfig,
michael@0: -        kBGR_Vertical_LCDConfig,
michael@0: +        kBGR_Vertical_LCDConfig
michael@0:      };
michael@0:  
michael@0:      enum FontHintLevel {
michael@0: @@ -25,7 +25,7 @@ public:
michael@0:          kSlight_FontHintLevel,
michael@0:          kNormal_FontHintLevel,
michael@0:          kFull_FontHintLevel,
michael@0: -        kAuto_FontHintLevel,
michael@0: +        kAuto_FontHintLevel
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: index 5714f9d..dc115fc 100644
michael@0: --- a/gfx/skia/include/core/SkFlattenable.h
michael@0: +++ b/gfx/skia/include/core/SkFlattenable.h
michael@0: @@ -272,7 +272,7 @@ public:
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: diff --git a/gfx/skia/include/core/SkFontHost.h b/gfx/skia/include/core/SkFontHost.h
michael@0: index 732de5c..10f9bdf 100644
michael@0: --- a/gfx/skia/include/core/SkFontHost.h
michael@0: +++ b/gfx/skia/include/core/SkFontHost.h
michael@0: @@ -240,7 +240,7 @@ public:
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: @@ -259,7 +259,7 @@ public:
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: diff --git a/gfx/skia/include/core/SkMaskFilter.h b/gfx/skia/include/core/SkMaskFilter.h
michael@0: index 9a470a4..3422e27 100644
michael@0: --- a/gfx/skia/include/core/SkMaskFilter.h
michael@0: +++ b/gfx/skia/include/core/SkMaskFilter.h
michael@0: @@ -61,7 +61,7 @@ public:
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: diff --git a/gfx/skia/include/core/SkPaint.h b/gfx/skia/include/core/SkPaint.h
michael@0: index ff37d77..7c96e193 100644
michael@0: --- a/gfx/skia/include/core/SkPaint.h
michael@0: +++ b/gfx/skia/include/core/SkPaint.h
michael@0: @@ -76,7 +76,7 @@ public:
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: @@ -289,7 +289,7 @@ public:
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: diff --git a/gfx/skia/include/core/SkScalerContext.h b/gfx/skia/include/core/SkScalerContext.h
michael@0: index 2cb171b..3dbce27 100644
michael@0: --- a/gfx/skia/include/core/SkScalerContext.h
michael@0: +++ b/gfx/skia/include/core/SkScalerContext.h
michael@0: @@ -182,21 +182,22 @@ public:
michael@0:          kGenA8FromLCD_Flag        = 0x0800,
michael@0:  
michael@0:  #ifdef SK_USE_COLOR_LUMINANCE
michael@0: -        kLuminance_Bits           = 3,
michael@0: +        kLuminance_Bits           = 3
michael@0:  #else
michael@0:          // luminance : 0 for black text, kLuminance_Max for white text
michael@0:          kLuminance_Shift          = 13, // shift to land in the high 3-bits of Flags
michael@0: -        kLuminance_Bits           = 3,  // ensure Flags doesn't exceed 16bits
michael@0: +        kLuminance_Bits           = 3   // ensure Flags doesn't exceed 16bits
michael@0:  #endif
michael@0:      };
michael@0:      
michael@0:      // computed values
michael@0:      enum {
michael@0: -        kHinting_Mask   = kHintingBit1_Flag | kHintingBit2_Flag,
michael@0:  #ifdef SK_USE_COLOR_LUMINANCE
michael@0: +        kHinting_Mask   = kHintingBit1_Flag | kHintingBit2_Flag
michael@0:  #else
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:  #endif
michael@0:      };
michael@0:  
michael@0: diff --git a/gfx/skia/include/core/SkTypes.h b/gfx/skia/include/core/SkTypes.h
michael@0: index 7963a7d..0c5c2d7 100644
michael@0: --- a/gfx/skia/include/core/SkTypes.h
michael@0: +++ b/gfx/skia/include/core/SkTypes.h
michael@0: @@ -438,7 +438,7 @@ public:
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: diff --git a/gfx/skia/include/effects/SkLayerDrawLooper.h b/gfx/skia/include/effects/SkLayerDrawLooper.h
michael@0: index 0bc4af2..6cb8ef6 100644
michael@0: --- a/gfx/skia/include/effects/SkLayerDrawLooper.h
michael@0: +++ b/gfx/skia/include/effects/SkLayerDrawLooper.h
michael@0: @@ -41,7 +41,7 @@ public:
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: diff --git a/gfx/skia/src/core/SkBitmap.cpp b/gfx/skia/src/core/SkBitmap.cpp
michael@0: index 6b99145..aff52fd 100644
michael@0: --- a/gfx/skia/src/core/SkBitmap.cpp
michael@0: +++ b/gfx/skia/src/core/SkBitmap.cpp
michael@0: @@ -1376,7 +1376,7 @@ enum {
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:  /*
michael@0: diff --git a/gfx/skia/src/core/SkGlyphCache.cpp b/gfx/skia/src/core/SkGlyphCache.cpp
michael@0: index f3363cd..1fddc9d 100644
michael@0: --- a/gfx/skia/src/core/SkGlyphCache.cpp
michael@0: +++ b/gfx/skia/src/core/SkGlyphCache.cpp
michael@0: @@ -417,7 +417,7 @@ class SkGlyphCache_Globals {
michael@0:  public:
michael@0:      enum UseMutex {
michael@0:          kNo_UseMutex,  // thread-local cache
michael@0: -        kYes_UseMutex, // shared cache
michael@0: +        kYes_UseMutex  // shared cache
michael@0:      };
michael@0:  
michael@0:      SkGlyphCache_Globals(UseMutex um) {
michael@0: -- 
michael@0: 1.7.5.4
michael@0: