1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1.2 +++ b/gfx/skia/patches/archive/0004-Bug-722011-Fix-trailing-commas-in-enums.patch Wed Dec 31 06:09:35 2014 +0100
1.3 @@ -0,0 +1,280 @@
1.4 +From 81d61682a94d47be5b47fb7882ea7e7c7e6c3351 Mon Sep 17 00:00:00 2001
1.5 +From: George Wright <gwright@mozilla.com>
1.6 +Date: Fri, 18 May 2012 14:15:28 -0400
1.7 +Subject: [PATCH 04/10] Bug 755869 - [7] Re-apply bug 722011 - Fix
1.8 + trailing commas at end of enum lists r=mattwoodrow
1.9 +
1.10 +---
1.11 + gfx/skia/include/core/SkAdvancedTypefaceMetrics.h | 8 ++++----
1.12 + gfx/skia/include/core/SkBlitRow.h | 2 +-
1.13 + gfx/skia/include/core/SkCanvas.h | 2 +-
1.14 + gfx/skia/include/core/SkDevice.h | 2 +-
1.15 + gfx/skia/include/core/SkDeviceProfile.h | 4 ++--
1.16 + gfx/skia/include/core/SkFlattenable.h | 2 +-
1.17 + gfx/skia/include/core/SkFontHost.h | 4 ++--
1.18 + gfx/skia/include/core/SkMaskFilter.h | 2 +-
1.19 + gfx/skia/include/core/SkPaint.h | 4 ++--
1.20 + gfx/skia/include/core/SkScalerContext.h | 9 +++++----
1.21 + gfx/skia/include/core/SkTypes.h | 2 +-
1.22 + gfx/skia/include/effects/SkLayerDrawLooper.h | 2 +-
1.23 + gfx/skia/src/core/SkBitmap.cpp | 2 +-
1.24 + gfx/skia/src/core/SkGlyphCache.cpp | 2 +-
1.25 + 14 files changed, 24 insertions(+), 23 deletions(-)
1.26 +
1.27 +diff --git a/gfx/skia/include/core/SkAdvancedTypefaceMetrics.h b/gfx/skia/include/core/SkAdvancedTypefaceMetrics.h
1.28 +index 09fc9a9..5ffdb45 100644
1.29 +--- a/gfx/skia/include/core/SkAdvancedTypefaceMetrics.h
1.30 ++++ b/gfx/skia/include/core/SkAdvancedTypefaceMetrics.h
1.31 +@@ -34,7 +34,7 @@ public:
1.32 + kCFF_Font,
1.33 + kTrueType_Font,
1.34 + kOther_Font,
1.35 +- kNotEmbeddable_Font,
1.36 ++ kNotEmbeddable_Font
1.37 + };
1.38 + // The type of the underlying font program. This field determines which
1.39 + // of the following fields are valid. If it is kOther_Font or
1.40 +@@ -56,7 +56,7 @@ public:
1.41 + kItalic_Style = 0x00040,
1.42 + kAllCaps_Style = 0x10000,
1.43 + kSmallCaps_Style = 0x20000,
1.44 +- kForceBold_Style = 0x40000,
1.45 ++ kForceBold_Style = 0x40000
1.46 + };
1.47 + uint16_t fStyle; // Font style characteristics.
1.48 + int16_t fItalicAngle; // Counterclockwise degrees from vertical of the
1.49 +@@ -75,7 +75,7 @@ public:
1.50 + kHAdvance_PerGlyphInfo = 0x1, // Populate horizontal advance data.
1.51 + kVAdvance_PerGlyphInfo = 0x2, // Populate vertical advance data.
1.52 + kGlyphNames_PerGlyphInfo = 0x4, // Populate glyph names (Type 1 only).
1.53 +- kToUnicode_PerGlyphInfo = 0x8, // Populate ToUnicode table, ignored
1.54 ++ kToUnicode_PerGlyphInfo = 0x8 // Populate ToUnicode table, ignored
1.55 + // for Type 1 fonts
1.56 + };
1.57 +
1.58 +@@ -84,7 +84,7 @@ public:
1.59 + enum MetricType {
1.60 + kDefault, // Default advance: fAdvance.count = 1
1.61 + kRange, // Advances for a range: fAdvance.count = fEndID-fStartID
1.62 +- kRun, // fStartID-fEndID have same advance: fAdvance.count = 1
1.63 ++ kRun // fStartID-fEndID have same advance: fAdvance.count = 1
1.64 + };
1.65 + MetricType fType;
1.66 + uint16_t fStartId;
1.67 +diff --git a/gfx/skia/include/core/SkBlitRow.h b/gfx/skia/include/core/SkBlitRow.h
1.68 +index 973ab4c..febc405 100644
1.69 +--- a/gfx/skia/include/core/SkBlitRow.h
1.70 ++++ b/gfx/skia/include/core/SkBlitRow.h
1.71 +@@ -42,7 +42,7 @@ public:
1.72 +
1.73 + enum Flags32 {
1.74 + kGlobalAlpha_Flag32 = 1 << 0,
1.75 +- kSrcPixelAlpha_Flag32 = 1 << 1,
1.76 ++ kSrcPixelAlpha_Flag32 = 1 << 1
1.77 + };
1.78 +
1.79 + /** Function pointer that blends 32bit colors onto a 32bit destination.
1.80 +diff --git a/gfx/skia/include/core/SkCanvas.h b/gfx/skia/include/core/SkCanvas.h
1.81 +index 25cc94a..d942783 100644
1.82 +--- a/gfx/skia/include/core/SkCanvas.h
1.83 ++++ b/gfx/skia/include/core/SkCanvas.h
1.84 +@@ -148,7 +148,7 @@ public:
1.85 + * low byte to high byte: R, G, B, A.
1.86 + */
1.87 + kRGBA_Premul_Config8888,
1.88 +- kRGBA_Unpremul_Config8888,
1.89 ++ kRGBA_Unpremul_Config8888
1.90 + };
1.91 +
1.92 + /**
1.93 +diff --git a/gfx/skia/include/core/SkDevice.h b/gfx/skia/include/core/SkDevice.h
1.94 +index 1e4e0a3..b4d44bf 100644
1.95 +--- a/gfx/skia/include/core/SkDevice.h
1.96 ++++ b/gfx/skia/include/core/SkDevice.h
1.97 +@@ -139,7 +139,7 @@ public:
1.98 + protected:
1.99 + enum Usage {
1.100 + kGeneral_Usage,
1.101 +- kSaveLayer_Usage, // <! internal use only
1.102 ++ kSaveLayer_Usage // <! internal use only
1.103 + };
1.104 +
1.105 + struct TextFlags {
1.106 +diff --git a/gfx/skia/include/core/SkDeviceProfile.h b/gfx/skia/include/core/SkDeviceProfile.h
1.107 +index 46b9781..f6a0bca 100644
1.108 +--- a/gfx/skia/include/core/SkDeviceProfile.h
1.109 ++++ b/gfx/skia/include/core/SkDeviceProfile.h
1.110 +@@ -17,7 +17,7 @@ public:
1.111 + kRGB_Horizontal_LCDConfig,
1.112 + kBGR_Horizontal_LCDConfig,
1.113 + kRGB_Vertical_LCDConfig,
1.114 +- kBGR_Vertical_LCDConfig,
1.115 ++ kBGR_Vertical_LCDConfig
1.116 + };
1.117 +
1.118 + enum FontHintLevel {
1.119 +@@ -25,7 +25,7 @@ public:
1.120 + kSlight_FontHintLevel,
1.121 + kNormal_FontHintLevel,
1.122 + kFull_FontHintLevel,
1.123 +- kAuto_FontHintLevel,
1.124 ++ kAuto_FontHintLevel
1.125 + };
1.126 +
1.127 + /**
1.128 +diff --git a/gfx/skia/include/core/SkFlattenable.h b/gfx/skia/include/core/SkFlattenable.h
1.129 +index 5714f9d..dc115fc 100644
1.130 +--- a/gfx/skia/include/core/SkFlattenable.h
1.131 ++++ b/gfx/skia/include/core/SkFlattenable.h
1.132 +@@ -272,7 +272,7 @@ public:
1.133 + * Instructs the writer to inline Factory names as there are seen the
1.134 + * first time (after that we store an index). The pipe code uses this.
1.135 + */
1.136 +- kInlineFactoryNames_Flag = 0x02,
1.137 ++ kInlineFactoryNames_Flag = 0x02
1.138 + };
1.139 + Flags getFlags() const { return (Flags)fFlags; }
1.140 + void setFlags(Flags flags) { fFlags = flags; }
1.141 +diff --git a/gfx/skia/include/core/SkFontHost.h b/gfx/skia/include/core/SkFontHost.h
1.142 +index 732de5c..10f9bdf 100644
1.143 +--- a/gfx/skia/include/core/SkFontHost.h
1.144 ++++ b/gfx/skia/include/core/SkFontHost.h
1.145 +@@ -240,7 +240,7 @@ public:
1.146 + */
1.147 + enum LCDOrientation {
1.148 + kHorizontal_LCDOrientation = 0, //!< this is the default
1.149 +- kVertical_LCDOrientation = 1,
1.150 ++ kVertical_LCDOrientation = 1
1.151 + };
1.152 +
1.153 + static void SetSubpixelOrientation(LCDOrientation orientation);
1.154 +@@ -259,7 +259,7 @@ public:
1.155 + enum LCDOrder {
1.156 + kRGB_LCDOrder = 0, //!< this is the default
1.157 + kBGR_LCDOrder = 1,
1.158 +- kNONE_LCDOrder = 2,
1.159 ++ kNONE_LCDOrder = 2
1.160 + };
1.161 +
1.162 + static void SetSubpixelOrder(LCDOrder order);
1.163 +diff --git a/gfx/skia/include/core/SkMaskFilter.h b/gfx/skia/include/core/SkMaskFilter.h
1.164 +index 9a470a4..3422e27 100644
1.165 +--- a/gfx/skia/include/core/SkMaskFilter.h
1.166 ++++ b/gfx/skia/include/core/SkMaskFilter.h
1.167 +@@ -61,7 +61,7 @@ public:
1.168 + kNormal_BlurType, //!< fuzzy inside and outside
1.169 + kSolid_BlurType, //!< solid inside, fuzzy outside
1.170 + kOuter_BlurType, //!< nothing inside, fuzzy outside
1.171 +- kInner_BlurType, //!< fuzzy inside, nothing outside
1.172 ++ kInner_BlurType //!< fuzzy inside, nothing outside
1.173 + };
1.174 +
1.175 + struct BlurInfo {
1.176 +diff --git a/gfx/skia/include/core/SkPaint.h b/gfx/skia/include/core/SkPaint.h
1.177 +index ff37d77..7c96e193 100644
1.178 +--- a/gfx/skia/include/core/SkPaint.h
1.179 ++++ b/gfx/skia/include/core/SkPaint.h
1.180 +@@ -76,7 +76,7 @@ public:
1.181 + kNo_Hinting = 0,
1.182 + kSlight_Hinting = 1,
1.183 + kNormal_Hinting = 2, //!< this is the default
1.184 +- kFull_Hinting = 3,
1.185 ++ kFull_Hinting = 3
1.186 + };
1.187 +
1.188 + Hinting getHinting() const {
1.189 +@@ -289,7 +289,7 @@ public:
1.190 + kStroke_Style, //!< stroke the geometry
1.191 + kStrokeAndFill_Style, //!< fill and stroke the geometry
1.192 +
1.193 +- kStyleCount,
1.194 ++ kStyleCount
1.195 + };
1.196 +
1.197 + /** Return the paint's style, used for controlling how primitives'
1.198 +diff --git a/gfx/skia/include/core/SkScalerContext.h b/gfx/skia/include/core/SkScalerContext.h
1.199 +index 2cb171b..3dbce27 100644
1.200 +--- a/gfx/skia/include/core/SkScalerContext.h
1.201 ++++ b/gfx/skia/include/core/SkScalerContext.h
1.202 +@@ -182,21 +182,22 @@ public:
1.203 + kGenA8FromLCD_Flag = 0x0800,
1.204 +
1.205 + #ifdef SK_USE_COLOR_LUMINANCE
1.206 +- kLuminance_Bits = 3,
1.207 ++ kLuminance_Bits = 3
1.208 + #else
1.209 + // luminance : 0 for black text, kLuminance_Max for white text
1.210 + kLuminance_Shift = 13, // shift to land in the high 3-bits of Flags
1.211 +- kLuminance_Bits = 3, // ensure Flags doesn't exceed 16bits
1.212 ++ kLuminance_Bits = 3 // ensure Flags doesn't exceed 16bits
1.213 + #endif
1.214 + };
1.215 +
1.216 + // computed values
1.217 + enum {
1.218 +- kHinting_Mask = kHintingBit1_Flag | kHintingBit2_Flag,
1.219 + #ifdef SK_USE_COLOR_LUMINANCE
1.220 ++ kHinting_Mask = kHintingBit1_Flag | kHintingBit2_Flag
1.221 + #else
1.222 ++ kHinting_Mask = kHintingBit1_Flag | kHintingBit2_Flag,
1.223 + kLuminance_Max = (1 << kLuminance_Bits) - 1,
1.224 +- kLuminance_Mask = kLuminance_Max << kLuminance_Shift,
1.225 ++ kLuminance_Mask = kLuminance_Max << kLuminance_Shift
1.226 + #endif
1.227 + };
1.228 +
1.229 +diff --git a/gfx/skia/include/core/SkTypes.h b/gfx/skia/include/core/SkTypes.h
1.230 +index 7963a7d..0c5c2d7 100644
1.231 +--- a/gfx/skia/include/core/SkTypes.h
1.232 ++++ b/gfx/skia/include/core/SkTypes.h
1.233 +@@ -438,7 +438,7 @@ public:
1.234 + * current block is dynamically allocated, just return the old
1.235 + * block.
1.236 + */
1.237 +- kReuse_OnShrink,
1.238 ++ kReuse_OnShrink
1.239 + };
1.240 +
1.241 + /**
1.242 +diff --git a/gfx/skia/include/effects/SkLayerDrawLooper.h b/gfx/skia/include/effects/SkLayerDrawLooper.h
1.243 +index 0bc4af2..6cb8ef6 100644
1.244 +--- a/gfx/skia/include/effects/SkLayerDrawLooper.h
1.245 ++++ b/gfx/skia/include/effects/SkLayerDrawLooper.h
1.246 +@@ -41,7 +41,7 @@ public:
1.247 + * - Flags and Color are always computed using the LayerInfo's
1.248 + * fFlagsMask and fColorMode.
1.249 + */
1.250 +- kEntirePaint_Bits = -1,
1.251 ++ kEntirePaint_Bits = -1
1.252 +
1.253 + };
1.254 + typedef int32_t BitFlags;
1.255 +diff --git a/gfx/skia/src/core/SkBitmap.cpp b/gfx/skia/src/core/SkBitmap.cpp
1.256 +index 6b99145..aff52fd 100644
1.257 +--- a/gfx/skia/src/core/SkBitmap.cpp
1.258 ++++ b/gfx/skia/src/core/SkBitmap.cpp
1.259 +@@ -1376,7 +1376,7 @@ enum {
1.260 + SERIALIZE_PIXELTYPE_RAW_WITH_CTABLE,
1.261 + SERIALIZE_PIXELTYPE_RAW_NO_CTABLE,
1.262 + SERIALIZE_PIXELTYPE_REF_DATA,
1.263 +- SERIALIZE_PIXELTYPE_REF_PTR,
1.264 ++ SERIALIZE_PIXELTYPE_REF_PTR
1.265 + };
1.266 +
1.267 + /*
1.268 +diff --git a/gfx/skia/src/core/SkGlyphCache.cpp b/gfx/skia/src/core/SkGlyphCache.cpp
1.269 +index f3363cd..1fddc9d 100644
1.270 +--- a/gfx/skia/src/core/SkGlyphCache.cpp
1.271 ++++ b/gfx/skia/src/core/SkGlyphCache.cpp
1.272 +@@ -417,7 +417,7 @@ class SkGlyphCache_Globals {
1.273 + public:
1.274 + enum UseMutex {
1.275 + kNo_UseMutex, // thread-local cache
1.276 +- kYes_UseMutex, // shared cache
1.277 ++ kYes_UseMutex // shared cache
1.278 + };
1.279 +
1.280 + SkGlyphCache_Globals(UseMutex um) {
1.281 +--
1.282 +1.7.5.4
1.283 +
