The Tor Browser / annotate

gfx/skia/patches/archive/0004-Bug-722011-Fix-trailing-commas-in-enums.patch@b8a032363ba2 (annotated)

gfx/skia/patches/archive/0004-Bug-722011-Fix-trailing-commas-in-enums.patch

Thu, 22 Jan 2015 13:21:57 +0100

author
Michael Schloh von Bennewitz <michael@schloh.com>
date
Thu, 22 Jan 2015 13:21:57 +0100
branch
TOR_BUG_9701
changeset 15
b8a032363ba2
permissions
-rw-r--r--

Incorporate requested changes from Mozilla in review:
https://bugzilla.mozilla.org/show_bug.cgi?id=1123480#c6

michael@0 1 From 81d61682a94d47be5b47fb7882ea7e7c7e6c3351 Mon Sep 17 00:00:00 2001
michael@0 2 From: George Wright <gwright@mozilla.com>
michael@0 3 Date: Fri, 18 May 2012 14:15:28 -0400
michael@0 4 Subject: [PATCH 04/10] Bug 755869 - [7] Re-apply bug 722011 - Fix
michael@0 5 trailing commas at end of enum lists r=mattwoodrow
michael@0 6
michael@0 7 ---
michael@0 8 gfx/skia/include/core/SkAdvancedTypefaceMetrics.h | 8 ++++----
michael@0 9 gfx/skia/include/core/SkBlitRow.h | 2 +-
michael@0 10 gfx/skia/include/core/SkCanvas.h | 2 +-
michael@0 11 gfx/skia/include/core/SkDevice.h | 2 +-
michael@0 12 gfx/skia/include/core/SkDeviceProfile.h | 4 ++--
michael@0 13 gfx/skia/include/core/SkFlattenable.h | 2 +-
michael@0 14 gfx/skia/include/core/SkFontHost.h | 4 ++--
michael@0 15 gfx/skia/include/core/SkMaskFilter.h | 2 +-
michael@0 16 gfx/skia/include/core/SkPaint.h | 4 ++--
michael@0 17 gfx/skia/include/core/SkScalerContext.h | 9 +++++----
michael@0 18 gfx/skia/include/core/SkTypes.h | 2 +-
michael@0 19 gfx/skia/include/effects/SkLayerDrawLooper.h | 2 +-
michael@0 20 gfx/skia/src/core/SkBitmap.cpp | 2 +-
michael@0 21 gfx/skia/src/core/SkGlyphCache.cpp | 2 +-
michael@0 22 14 files changed, 24 insertions(+), 23 deletions(-)
michael@0 23
michael@0 24 diff --git a/gfx/skia/include/core/SkAdvancedTypefaceMetrics.h b/gfx/skia/include/core/SkAdvancedTypefaceMetrics.h
michael@0 25 index 09fc9a9..5ffdb45 100644
michael@0 26 --- a/gfx/skia/include/core/SkAdvancedTypefaceMetrics.h
michael@0 27 +++ b/gfx/skia/include/core/SkAdvancedTypefaceMetrics.h
michael@0 28 @@ -34,7 +34,7 @@ public:
michael@0 29 kCFF_Font,
michael@0 30 kTrueType_Font,
michael@0 31 kOther_Font,
michael@0 32 - kNotEmbeddable_Font,
michael@0 33 + kNotEmbeddable_Font
michael@0 34 };
michael@0 35 // The type of the underlying font program. This field determines which
michael@0 36 // of the following fields are valid. If it is kOther_Font or
michael@0 37 @@ -56,7 +56,7 @@ public:
michael@0 38 kItalic_Style = 0x00040,
michael@0 39 kAllCaps_Style = 0x10000,
michael@0 40 kSmallCaps_Style = 0x20000,
michael@0 41 - kForceBold_Style = 0x40000,
michael@0 42 + kForceBold_Style = 0x40000
michael@0 43 };
michael@0 44 uint16_t fStyle; // Font style characteristics.
michael@0 45 int16_t fItalicAngle; // Counterclockwise degrees from vertical of the
michael@0 46 @@ -75,7 +75,7 @@ public:
michael@0 47 kHAdvance_PerGlyphInfo = 0x1, // Populate horizontal advance data.
michael@0 48 kVAdvance_PerGlyphInfo = 0x2, // Populate vertical advance data.
michael@0 49 kGlyphNames_PerGlyphInfo = 0x4, // Populate glyph names (Type 1 only).
michael@0 50 - kToUnicode_PerGlyphInfo = 0x8, // Populate ToUnicode table, ignored
michael@0 51 + kToUnicode_PerGlyphInfo = 0x8 // Populate ToUnicode table, ignored
michael@0 52 // for Type 1 fonts
michael@0 53 };
michael@0 54
michael@0 55 @@ -84,7 +84,7 @@ public:
michael@0 56 enum MetricType {
michael@0 57 kDefault, // Default advance: fAdvance.count = 1
michael@0 58 kRange, // Advances for a range: fAdvance.count = fEndID-fStartID
michael@0 59 - kRun, // fStartID-fEndID have same advance: fAdvance.count = 1
michael@0 60 + kRun // fStartID-fEndID have same advance: fAdvance.count = 1
michael@0 61 };
michael@0 62 MetricType fType;
michael@0 63 uint16_t fStartId;
michael@0 64 diff --git a/gfx/skia/include/core/SkBlitRow.h b/gfx/skia/include/core/SkBlitRow.h
michael@0 65 index 973ab4c..febc405 100644
michael@0 66 --- a/gfx/skia/include/core/SkBlitRow.h
michael@0 67 +++ b/gfx/skia/include/core/SkBlitRow.h
michael@0 68 @@ -42,7 +42,7 @@ public:
michael@0 69
michael@0 70 enum Flags32 {
michael@0 71 kGlobalAlpha_Flag32 = 1 << 0,
michael@0 72 - kSrcPixelAlpha_Flag32 = 1 << 1,
michael@0 73 + kSrcPixelAlpha_Flag32 = 1 << 1
michael@0 74 };
michael@0 75
michael@0 76 /** Function pointer that blends 32bit colors onto a 32bit destination.
michael@0 77 diff --git a/gfx/skia/include/core/SkCanvas.h b/gfx/skia/include/core/SkCanvas.h
michael@0 78 index 25cc94a..d942783 100644
michael@0 79 --- a/gfx/skia/include/core/SkCanvas.h
michael@0 80 +++ b/gfx/skia/include/core/SkCanvas.h
michael@0 81 @@ -148,7 +148,7 @@ public:
michael@0 82 * low byte to high byte: R, G, B, A.
michael@0 83 */
michael@0 84 kRGBA_Premul_Config8888,
michael@0 85 - kRGBA_Unpremul_Config8888,
michael@0 86 + kRGBA_Unpremul_Config8888
michael@0 87 };
michael@0 88
michael@0 89 /**
michael@0 90 diff --git a/gfx/skia/include/core/SkDevice.h b/gfx/skia/include/core/SkDevice.h
michael@0 91 index 1e4e0a3..b4d44bf 100644
michael@0 92 --- a/gfx/skia/include/core/SkDevice.h
michael@0 93 +++ b/gfx/skia/include/core/SkDevice.h
michael@0 94 @@ -139,7 +139,7 @@ public:
michael@0 95 protected:
michael@0 96 enum Usage {
michael@0 97 kGeneral_Usage,
michael@0 98 - kSaveLayer_Usage, // <! internal use only
michael@0 99 + kSaveLayer_Usage // <! internal use only
michael@0 100 };
michael@0 101
michael@0 102 struct TextFlags {
michael@0 103 diff --git a/gfx/skia/include/core/SkDeviceProfile.h b/gfx/skia/include/core/SkDeviceProfile.h
michael@0 104 index 46b9781..f6a0bca 100644
michael@0 105 --- a/gfx/skia/include/core/SkDeviceProfile.h
michael@0 106 +++ b/gfx/skia/include/core/SkDeviceProfile.h
michael@0 107 @@ -17,7 +17,7 @@ public:
michael@0 108 kRGB_Horizontal_LCDConfig,
michael@0 109 kBGR_Horizontal_LCDConfig,
michael@0 110 kRGB_Vertical_LCDConfig,
michael@0 111 - kBGR_Vertical_LCDConfig,
michael@0 112 + kBGR_Vertical_LCDConfig
michael@0 113 };
michael@0 114
michael@0 115 enum FontHintLevel {
michael@0 116 @@ -25,7 +25,7 @@ public:
michael@0 117 kSlight_FontHintLevel,
michael@0 118 kNormal_FontHintLevel,
michael@0 119 kFull_FontHintLevel,
michael@0 120 - kAuto_FontHintLevel,
michael@0 121 + kAuto_FontHintLevel
michael@0 122 };
michael@0 123
michael@0 124 /**
michael@0 125 diff --git a/gfx/skia/include/core/SkFlattenable.h b/gfx/skia/include/core/SkFlattenable.h
michael@0 126 index 5714f9d..dc115fc 100644
michael@0 127 --- a/gfx/skia/include/core/SkFlattenable.h
michael@0 128 +++ b/gfx/skia/include/core/SkFlattenable.h
michael@0 129 @@ -272,7 +272,7 @@ public:
michael@0 130 * Instructs the writer to inline Factory names as there are seen the
michael@0 131 * first time (after that we store an index). The pipe code uses this.
michael@0 132 */
michael@0 133 - kInlineFactoryNames_Flag = 0x02,
michael@0 134 + kInlineFactoryNames_Flag = 0x02
michael@0 135 };
michael@0 136 Flags getFlags() const { return (Flags)fFlags; }
michael@0 137 void setFlags(Flags flags) { fFlags = flags; }
michael@0 138 diff --git a/gfx/skia/include/core/SkFontHost.h b/gfx/skia/include/core/SkFontHost.h
michael@0 139 index 732de5c..10f9bdf 100644
michael@0 140 --- a/gfx/skia/include/core/SkFontHost.h
michael@0 141 +++ b/gfx/skia/include/core/SkFontHost.h
michael@0 142 @@ -240,7 +240,7 @@ public:
michael@0 143 */
michael@0 144 enum LCDOrientation {
michael@0 145 kHorizontal_LCDOrientation = 0, //!< this is the default
michael@0 146 - kVertical_LCDOrientation = 1,
michael@0 147 + kVertical_LCDOrientation = 1
michael@0 148 };
michael@0 149
michael@0 150 static void SetSubpixelOrientation(LCDOrientation orientation);
michael@0 151 @@ -259,7 +259,7 @@ public:
michael@0 152 enum LCDOrder {
michael@0 153 kRGB_LCDOrder = 0, //!< this is the default
michael@0 154 kBGR_LCDOrder = 1,
michael@0 155 - kNONE_LCDOrder = 2,
michael@0 156 + kNONE_LCDOrder = 2
michael@0 157 };
michael@0 158
michael@0 159 static void SetSubpixelOrder(LCDOrder order);
michael@0 160 diff --git a/gfx/skia/include/core/SkMaskFilter.h b/gfx/skia/include/core/SkMaskFilter.h
michael@0 161 index 9a470a4..3422e27 100644
michael@0 162 --- a/gfx/skia/include/core/SkMaskFilter.h
michael@0 163 +++ b/gfx/skia/include/core/SkMaskFilter.h
michael@0 164 @@ -61,7 +61,7 @@ public:
michael@0 165 kNormal_BlurType, //!< fuzzy inside and outside
michael@0 166 kSolid_BlurType, //!< solid inside, fuzzy outside
michael@0 167 kOuter_BlurType, //!< nothing inside, fuzzy outside
michael@0 168 - kInner_BlurType, //!< fuzzy inside, nothing outside
michael@0 169 + kInner_BlurType //!< fuzzy inside, nothing outside
michael@0 170 };
michael@0 171
michael@0 172 struct BlurInfo {
michael@0 173 diff --git a/gfx/skia/include/core/SkPaint.h b/gfx/skia/include/core/SkPaint.h
michael@0 174 index ff37d77..7c96e193 100644
michael@0 175 --- a/gfx/skia/include/core/SkPaint.h
michael@0 176 +++ b/gfx/skia/include/core/SkPaint.h
michael@0 177 @@ -76,7 +76,7 @@ public:
michael@0 178 kNo_Hinting = 0,
michael@0 179 kSlight_Hinting = 1,
michael@0 180 kNormal_Hinting = 2, //!< this is the default
michael@0 181 - kFull_Hinting = 3,
michael@0 182 + kFull_Hinting = 3
michael@0 183 };
michael@0 184
michael@0 185 Hinting getHinting() const {
michael@0 186 @@ -289,7 +289,7 @@ public:
michael@0 187 kStroke_Style, //!< stroke the geometry
michael@0 188 kStrokeAndFill_Style, //!< fill and stroke the geometry
michael@0 189
michael@0 190 - kStyleCount,
michael@0 191 + kStyleCount
michael@0 192 };
michael@0 193
michael@0 194 /** Return the paint's style, used for controlling how primitives'
michael@0 195 diff --git a/gfx/skia/include/core/SkScalerContext.h b/gfx/skia/include/core/SkScalerContext.h
michael@0 196 index 2cb171b..3dbce27 100644
michael@0 197 --- a/gfx/skia/include/core/SkScalerContext.h
michael@0 198 +++ b/gfx/skia/include/core/SkScalerContext.h
michael@0 199 @@ -182,21 +182,22 @@ public:
michael@0 200 kGenA8FromLCD_Flag = 0x0800,
michael@0 201
michael@0 202 #ifdef SK_USE_COLOR_LUMINANCE
michael@0 203 - kLuminance_Bits = 3,
michael@0 204 + kLuminance_Bits = 3
michael@0 205 #else
michael@0 206 // luminance : 0 for black text, kLuminance_Max for white text
michael@0 207 kLuminance_Shift = 13, // shift to land in the high 3-bits of Flags
michael@0 208 - kLuminance_Bits = 3, // ensure Flags doesn't exceed 16bits
michael@0 209 + kLuminance_Bits = 3 // ensure Flags doesn't exceed 16bits
michael@0 210 #endif
michael@0 211 };
michael@0 212
michael@0 213 // computed values
michael@0 214 enum {
michael@0 215 - kHinting_Mask = kHintingBit1_Flag | kHintingBit2_Flag,
michael@0 216 #ifdef SK_USE_COLOR_LUMINANCE
michael@0 217 + kHinting_Mask = kHintingBit1_Flag | kHintingBit2_Flag
michael@0 218 #else
michael@0 219 + kHinting_Mask = kHintingBit1_Flag | kHintingBit2_Flag,
michael@0 220 kLuminance_Max = (1 << kLuminance_Bits) - 1,
michael@0 221 - kLuminance_Mask = kLuminance_Max << kLuminance_Shift,
michael@0 222 + kLuminance_Mask = kLuminance_Max << kLuminance_Shift
michael@0 223 #endif
michael@0 224 };
michael@0 225
michael@0 226 diff --git a/gfx/skia/include/core/SkTypes.h b/gfx/skia/include/core/SkTypes.h
michael@0 227 index 7963a7d..0c5c2d7 100644
michael@0 228 --- a/gfx/skia/include/core/SkTypes.h
michael@0 229 +++ b/gfx/skia/include/core/SkTypes.h
michael@0 230 @@ -438,7 +438,7 @@ public:
michael@0 231 * current block is dynamically allocated, just return the old
michael@0 232 * block.
michael@0 233 */
michael@0 234 - kReuse_OnShrink,
michael@0 235 + kReuse_OnShrink
michael@0 236 };
michael@0 237
michael@0 238 /**
michael@0 239 diff --git a/gfx/skia/include/effects/SkLayerDrawLooper.h b/gfx/skia/include/effects/SkLayerDrawLooper.h
michael@0 240 index 0bc4af2..6cb8ef6 100644
michael@0 241 --- a/gfx/skia/include/effects/SkLayerDrawLooper.h
michael@0 242 +++ b/gfx/skia/include/effects/SkLayerDrawLooper.h
michael@0 243 @@ -41,7 +41,7 @@ public:
michael@0 244 * - Flags and Color are always computed using the LayerInfo's
michael@0 245 * fFlagsMask and fColorMode.
michael@0 246 */
michael@0 247 - kEntirePaint_Bits = -1,
michael@0 248 + kEntirePaint_Bits = -1
michael@0 249
michael@0 250 };
michael@0 251 typedef int32_t BitFlags;
michael@0 252 diff --git a/gfx/skia/src/core/SkBitmap.cpp b/gfx/skia/src/core/SkBitmap.cpp
michael@0 253 index 6b99145..aff52fd 100644
michael@0 254 --- a/gfx/skia/src/core/SkBitmap.cpp
michael@0 255 +++ b/gfx/skia/src/core/SkBitmap.cpp
michael@0 256 @@ -1376,7 +1376,7 @@ enum {
michael@0 257 SERIALIZE_PIXELTYPE_RAW_WITH_CTABLE,
michael@0 258 SERIALIZE_PIXELTYPE_RAW_NO_CTABLE,
michael@0 259 SERIALIZE_PIXELTYPE_REF_DATA,
michael@0 260 - SERIALIZE_PIXELTYPE_REF_PTR,
michael@0 261 + SERIALIZE_PIXELTYPE_REF_PTR
michael@0 262 };
michael@0 263
michael@0 264 /*
michael@0 265 diff --git a/gfx/skia/src/core/SkGlyphCache.cpp b/gfx/skia/src/core/SkGlyphCache.cpp
michael@0 266 index f3363cd..1fddc9d 100644
michael@0 267 --- a/gfx/skia/src/core/SkGlyphCache.cpp
michael@0 268 +++ b/gfx/skia/src/core/SkGlyphCache.cpp
michael@0 269 @@ -417,7 +417,7 @@ class SkGlyphCache_Globals {
michael@0 270 public:
michael@0 271 enum UseMutex {
michael@0 272 kNo_UseMutex, // thread-local cache
michael@0 273 - kYes_UseMutex, // shared cache
michael@0 274 + kYes_UseMutex // shared cache
michael@0 275 };
michael@0 276
michael@0 277 SkGlyphCache_Globals(UseMutex um) {
michael@0 278 --
michael@0 279 1.7.5.4
michael@0 280

Mercurial Repository: The Tor Browser

Europalab SCM Repository Server

mercurial