The Tor Browser / annotate

gfx/skia/patches/archive/fix-comma-end-enum-list.patch@129ffea94266 (annotated)

gfx/skia/patches/archive/fix-comma-end-enum-list.patch

Sat, 03 Jan 2015 20:18:00 +0100

author
Michael Schloh von Bennewitz <michael@schloh.com>
date
Sat, 03 Jan 2015 20:18:00 +0100
branch
TOR_BUG_3246
changeset 7
129ffea94266
permissions
-rw-r--r--

Conditionally enable double key logic according to:
private browsing mode or privacy.thirdparty.isolate preference and
implement in GetCookieStringCommon and FindCookie where it counts...
With some reservations of how to convince FindCookie users to test
condition and pass a nullptr when disabling double key logic.

michael@0 1 diff --git a/gfx/skia/include/core/SkAdvancedTypefaceMetrics.h b/gfx/skia/include/core/SkAdvancedTypefaceMetrics.h
michael@0 2 --- a/gfx/skia/include/core/SkAdvancedTypefaceMetrics.h
michael@0 3 +++ b/gfx/skia/include/core/SkAdvancedTypefaceMetrics.h
michael@0 4 @@ -29,17 +29,17 @@ public:
michael@0 5 SkString fFontName;
michael@0 6
michael@0 7 enum FontType {
michael@0 8 kType1_Font,
michael@0 9 kType1CID_Font,
michael@0 10 kCFF_Font,
michael@0 11 kTrueType_Font,
michael@0 12 kOther_Font,
michael@0 13 - kNotEmbeddable_Font,
michael@0 14 + kNotEmbeddable_Font
michael@0 15 };
michael@0 16 // The type of the underlying font program. This field determines which
michael@0 17 // of the following fields are valid. If it is kOther_Font or
michael@0 18 // kNotEmbeddable_Font, the per glyph information will never be populated.
michael@0 19 FontType fType;
michael@0 20
michael@0 21 // fMultiMaster may be true for Type1_Font or CFF_Font.
michael@0 22 bool fMultiMaster;
michael@0 23 @@ -51,17 +51,17 @@ public:
michael@0 24 kFixedPitch_Style = 0x00001,
michael@0 25 kSerif_Style = 0x00002,
michael@0 26 kSymbolic_Style = 0x00004,
michael@0 27 kScript_Style = 0x00008,
michael@0 28 kNonsymbolic_Style = 0x00020,
michael@0 29 kItalic_Style = 0x00040,
michael@0 30 kAllCaps_Style = 0x10000,
michael@0 31 kSmallCaps_Style = 0x20000,
michael@0 32 - kForceBold_Style = 0x40000,
michael@0 33 + kForceBold_Style = 0x40000
michael@0 34 };
michael@0 35 uint16_t fStyle; // Font style characteristics.
michael@0 36 int16_t fItalicAngle; // Counterclockwise degrees from vertical of the
michael@0 37 // dominant vertical stroke for an Italic face.
michael@0 38 // The following fields are all in font units.
michael@0 39 int16_t fAscent; // Max height above baseline, not including accents.
michael@0 40 int16_t fDescent; // Max depth below baseline (negative).
michael@0 41 int16_t fStemV; // Thickness of dominant vertical stem.
michael@0 42 @@ -70,26 +70,26 @@ public:
michael@0 43 SkIRect fBBox; // The bounding box of all glyphs (in font units).
michael@0 44
michael@0 45 // The type of advance data wanted.
michael@0 46 enum PerGlyphInfo {
michael@0 47 kNo_PerGlyphInfo = 0x0, // Don't populate any per glyph info.
michael@0 48 kHAdvance_PerGlyphInfo = 0x1, // Populate horizontal advance data.
michael@0 49 kVAdvance_PerGlyphInfo = 0x2, // Populate vertical advance data.
michael@0 50 kGlyphNames_PerGlyphInfo = 0x4, // Populate glyph names (Type 1 only).
michael@0 51 - kToUnicode_PerGlyphInfo = 0x8, // Populate ToUnicode table, ignored
michael@0 52 + kToUnicode_PerGlyphInfo = 0x8 // Populate ToUnicode table, ignored
michael@0 53 // for Type 1 fonts
michael@0 54 };
michael@0 55
michael@0 56 template <typename Data>
michael@0 57 struct AdvanceMetric {
michael@0 58 enum MetricType {
michael@0 59 kDefault, // Default advance: fAdvance.count = 1
michael@0 60 kRange, // Advances for a range: fAdvance.count = fEndID-fStartID
michael@0 61 - kRun, // fStartID-fEndID have same advance: fAdvance.count = 1
michael@0 62 + kRun // fStartID-fEndID have same advance: fAdvance.count = 1
michael@0 63 };
michael@0 64 MetricType fType;
michael@0 65 uint16_t fStartId;
michael@0 66 uint16_t fEndId;
michael@0 67 SkTDArray<Data> fAdvance;
michael@0 68 SkTScopedPtr<AdvanceMetric<Data> > fNext;
michael@0 69 };
michael@0 70
michael@0 71 diff --git a/gfx/skia/include/core/SkBlitRow.h b/gfx/skia/include/core/SkBlitRow.h
michael@0 72 --- a/gfx/skia/include/core/SkBlitRow.h
michael@0 73 +++ b/gfx/skia/include/core/SkBlitRow.h
michael@0 74 @@ -44,17 +44,17 @@ public:
michael@0 75
michael@0 76 //! Public entry-point to return a blit function ptr
michael@0 77 static Proc Factory(unsigned flags, SkBitmap::Config);
michael@0 78
michael@0 79 ///////////// D32 version
michael@0 80
michael@0 81 enum Flags32 {
michael@0 82 kGlobalAlpha_Flag32 = 1 << 0,
michael@0 83 - kSrcPixelAlpha_Flag32 = 1 << 1,
michael@0 84 + kSrcPixelAlpha_Flag32 = 1 << 1
michael@0 85 };
michael@0 86
michael@0 87 /** Function pointer that blends 32bit colors onto a 32bit destination.
michael@0 88 @param dst array of dst 32bit colors
michael@0 89 @param src array of src 32bit colors (w/ or w/o alpha)
michael@0 90 @param count number of colors to blend
michael@0 91 @param alpha global alpha to be applied to all src colors
michael@0 92 */
michael@0 93 diff --git a/gfx/skia/include/core/SkCanvas.h b/gfx/skia/include/core/SkCanvas.h
michael@0 94 --- a/gfx/skia/include/core/SkCanvas.h
michael@0 95 +++ b/gfx/skia/include/core/SkCanvas.h
michael@0 96 @@ -132,17 +132,17 @@ public:
michael@0 97 * low byte to high byte: B, G, R, A.
michael@0 98 */
michael@0 99 kBGRA_Premul_Config8888,
michael@0 100 kBGRA_Unpremul_Config8888,
michael@0 101 /**
michael@0 102 * low byte to high byte: R, G, B, A.
michael@0 103 */
michael@0 104 kRGBA_Premul_Config8888,
michael@0 105 - kRGBA_Unpremul_Config8888,
michael@0 106 + kRGBA_Unpremul_Config8888
michael@0 107 };
michael@0 108
michael@0 109 /**
michael@0 110 * On success (returns true), copy the canvas pixels into the bitmap.
michael@0 111 * On failure, the bitmap parameter is left unchanged and false is
michael@0 112 * returned.
michael@0 113 *
michael@0 114 * The canvas' pixels are converted to the bitmap's config. The only
michael@0 115 diff --git a/gfx/skia/include/core/SkDevice.h b/gfx/skia/include/core/SkDevice.h
michael@0 116 --- a/gfx/skia/include/core/SkDevice.h
michael@0 117 +++ b/gfx/skia/include/core/SkDevice.h
michael@0 118 @@ -134,17 +134,17 @@ public:
michael@0 119 * Return the device's origin: its offset in device coordinates from
michael@0 120 * the default origin in its canvas' matrix/clip
michael@0 121 */
michael@0 122 const SkIPoint& getOrigin() const { return fOrigin; }
michael@0 123
michael@0 124 protected:
michael@0 125 enum Usage {
michael@0 126 kGeneral_Usage,
michael@0 127 - kSaveLayer_Usage, // <! internal use only
michael@0 128 + kSaveLayer_Usage // <! internal use only
michael@0 129 };
michael@0 130
michael@0 131 struct TextFlags {
michael@0 132 uint32_t fFlags; // SkPaint::getFlags()
michael@0 133 SkPaint::Hinting fHinting;
michael@0 134 };
michael@0 135
michael@0 136 /**
michael@0 137 diff --git a/gfx/skia/include/core/SkFlattenable.h b/gfx/skia/include/core/SkFlattenable.h
michael@0 138 --- a/gfx/skia/include/core/SkFlattenable.h
michael@0 139 +++ b/gfx/skia/include/core/SkFlattenable.h
michael@0 140 @@ -216,17 +216,17 @@ public:
michael@0 141 SkFactorySet* setFactoryRecorder(SkFactorySet*);
michael@0 142
michael@0 143 enum Flags {
michael@0 144 kCrossProcess_Flag = 0x01,
michael@0 145 /**
michael@0 146 * Instructs the writer to inline Factory names as there are seen the
michael@0 147 * first time (after that we store an index). The pipe code uses this.
michael@0 148 */
michael@0 149 - kInlineFactoryNames_Flag = 0x02,
michael@0 150 + kInlineFactoryNames_Flag = 0x02
michael@0 151 };
michael@0 152 Flags getFlags() const { return (Flags)fFlags; }
michael@0 153 void setFlags(Flags flags) { fFlags = flags; }
michael@0 154
michael@0 155 bool isCrossProcess() const {
michael@0 156 return SkToBool(fFlags & kCrossProcess_Flag);
michael@0 157 }
michael@0 158 bool inlineFactoryNames() const {
michael@0 159 diff --git a/gfx/skia/include/core/SkFontHost.h b/gfx/skia/include/core/SkFontHost.h
michael@0 160 --- a/gfx/skia/include/core/SkFontHost.h
michael@0 161 +++ b/gfx/skia/include/core/SkFontHost.h
michael@0 162 @@ -245,17 +245,17 @@ public:
michael@0 163 vertically. When rendering subpixel glyphs we need to know which way
michael@0 164 round they are.
michael@0 165
michael@0 166 Note, if you change this after startup, you'll need to flush the glyph
michael@0 167 cache because it'll have the wrong type of masks cached.
michael@0 168 */
michael@0 169 enum LCDOrientation {
michael@0 170 kHorizontal_LCDOrientation = 0, //!< this is the default
michael@0 171 - kVertical_LCDOrientation = 1,
michael@0 172 + kVertical_LCDOrientation = 1
michael@0 173 };
michael@0 174
michael@0 175 static void SetSubpixelOrientation(LCDOrientation orientation);
michael@0 176 static LCDOrientation GetSubpixelOrientation();
michael@0 177
michael@0 178 /** LCD color elements can vary in order. For subpixel text we need to know
michael@0 179 the order which the LCDs uses so that the color fringes are in the
michael@0 180 correct place.
michael@0 181 @@ -264,17 +264,17 @@ public:
michael@0 182 cache because it'll have the wrong type of masks cached.
michael@0 183
michael@0 184 kNONE_LCDOrder means that the subpixel elements are not spatially
michael@0 185 separated in any usable fashion.
michael@0 186 */
michael@0 187 enum LCDOrder {
michael@0 188 kRGB_LCDOrder = 0, //!< this is the default
michael@0 189 kBGR_LCDOrder = 1,
michael@0 190 - kNONE_LCDOrder = 2,
michael@0 191 + kNONE_LCDOrder = 2
michael@0 192 };
michael@0 193
michael@0 194 static void SetSubpixelOrder(LCDOrder order);
michael@0 195 static LCDOrder GetSubpixelOrder();
michael@0 196
michael@0 197 #ifdef SK_BUILD_FOR_ANDROID
michael@0 198 ///////////////////////////////////////////////////////////////////////////
michael@0 199
michael@0 200 diff --git a/gfx/skia/include/core/SkMaskFilter.h b/gfx/skia/include/core/SkMaskFilter.h
michael@0 201 --- a/gfx/skia/include/core/SkMaskFilter.h
michael@0 202 +++ b/gfx/skia/include/core/SkMaskFilter.h
michael@0 203 @@ -57,17 +57,17 @@ public:
michael@0 204
michael@0 205 virtual void flatten(SkFlattenableWriteBuffer& ) {}
michael@0 206
michael@0 207 enum BlurType {
michael@0 208 kNone_BlurType, //!< this maskfilter is not a blur
michael@0 209 kNormal_BlurType, //!< fuzzy inside and outside
michael@0 210 kSolid_BlurType, //!< solid inside, fuzzy outside
michael@0 211 kOuter_BlurType, //!< nothing inside, fuzzy outside
michael@0 212 - kInner_BlurType, //!< fuzzy inside, nothing outside
michael@0 213 + kInner_BlurType //!< fuzzy inside, nothing outside
michael@0 214 };
michael@0 215
michael@0 216 struct BlurInfo {
michael@0 217 SkScalar fRadius;
michael@0 218 bool fIgnoreTransform;
michael@0 219 bool fHighQuality;
michael@0 220 };
michael@0 221
michael@0 222 diff --git a/gfx/skia/include/core/SkPaint.h b/gfx/skia/include/core/SkPaint.h
michael@0 223 --- a/gfx/skia/include/core/SkPaint.h
michael@0 224 +++ b/gfx/skia/include/core/SkPaint.h
michael@0 225 @@ -70,17 +70,17 @@ public:
michael@0 226 kFull_Hinting -> <same as kNormalHinting, unless we are rendering
michael@0 227 subpixel glyphs, in which case TARGET_LCD or
michael@0 228 TARGET_LCD_V is used>
michael@0 229 */
michael@0 230 enum Hinting {
michael@0 231 kNo_Hinting = 0,
michael@0 232 kSlight_Hinting = 1,
michael@0 233 kNormal_Hinting = 2, //!< this is the default
michael@0 234 - kFull_Hinting = 3,
michael@0 235 + kFull_Hinting = 3
michael@0 236 };
michael@0 237
michael@0 238 Hinting getHinting() const {
michael@0 239 return static_cast<Hinting>(fHinting);
michael@0 240 }
michael@0 241
michael@0 242 void setHinting(Hinting hintingLevel);
michael@0 243
michael@0 244 @@ -282,17 +282,17 @@ public:
michael@0 245 results may not appear the same as if it was drawn twice, filled and
michael@0 246 then stroked.
michael@0 247 */
michael@0 248 enum Style {
michael@0 249 kFill_Style, //!< fill the geometry
michael@0 250 kStroke_Style, //!< stroke the geometry
michael@0 251 kStrokeAndFill_Style, //!< fill and stroke the geometry
michael@0 252
michael@0 253 - kStyleCount,
michael@0 254 + kStyleCount
michael@0 255 };
michael@0 256
michael@0 257 /** Return the paint's style, used for controlling how primitives'
michael@0 258 geometries are interpreted (except for drawBitmap, which always assumes
michael@0 259 kFill_Style).
michael@0 260 @return the paint's Style
michael@0 261 */
michael@0 262 Style getStyle() const { return (Style)fStyle; }
michael@0 263 diff --git a/gfx/skia/include/core/SkScalerContext.h b/gfx/skia/include/core/SkScalerContext.h
michael@0 264 --- a/gfx/skia/include/core/SkScalerContext.h
michael@0 265 +++ b/gfx/skia/include/core/SkScalerContext.h
michael@0 266 @@ -172,24 +172,24 @@ public:
michael@0 267 kHintingBit2_Flag = 0x0100,
michael@0 268
michael@0 269 // these should only ever be set if fMaskFormat is LCD16 or LCD32
michael@0 270 kLCD_Vertical_Flag = 0x0200, // else Horizontal
michael@0 271 kLCD_BGROrder_Flag = 0x0400, // else RGB order
michael@0 272
michael@0 273 // luminance : 0 for black text, kLuminance_Max for white text
michael@0 274 kLuminance_Shift = 11, // to shift into the other flags above
michael@0 275 - kLuminance_Bits = 3, // ensure Flags doesn't exceed 16bits
michael@0 276 + kLuminance_Bits = 3 // ensure Flags doesn't exceed 16bits
michael@0 277 };
michael@0 278
michael@0 279 // computed values
michael@0 280 enum {
michael@0 281 kHinting_Mask = kHintingBit1_Flag | kHintingBit2_Flag,
michael@0 282 kLuminance_Max = (1 << kLuminance_Bits) - 1,
michael@0 283 - kLuminance_Mask = kLuminance_Max << kLuminance_Shift,
michael@0 284 + kLuminance_Mask = kLuminance_Max << kLuminance_Shift
michael@0 285 };
michael@0 286
michael@0 287 struct Rec {
michael@0 288 uint32_t fOrigFontID;
michael@0 289 uint32_t fFontID;
michael@0 290 SkScalar fTextSize, fPreScaleX, fPreSkewX;
michael@0 291 SkScalar fPost2x2[2][2];
michael@0 292 SkScalar fFrameWidth, fMiterLimit;
michael@0 293 diff --git a/gfx/skia/include/core/SkTypes.h b/gfx/skia/include/core/SkTypes.h
michael@0 294 --- a/gfx/skia/include/core/SkTypes.h
michael@0 295 +++ b/gfx/skia/include/core/SkTypes.h
michael@0 296 @@ -433,17 +433,17 @@ public:
michael@0 297 */
michael@0 298 kAlloc_OnShrink,
michael@0 299
michael@0 300 /**
michael@0 301 * If the requested size is smaller than the current size, and the
michael@0 302 * current block is dynamically allocated, just return the old
michael@0 303 * block.
michael@0 304 */
michael@0 305 - kReuse_OnShrink,
michael@0 306 + kReuse_OnShrink
michael@0 307 };
michael@0 308
michael@0 309 /**
michael@0 310 * Reallocates the block to a new size. The ptr may or may not change.
michael@0 311 */
michael@0 312 void* reset(size_t size, OnShrink shrink = kAlloc_OnShrink) {
michael@0 313 if (size == fSize || (kReuse_OnShrink == shrink && size < fSize)) {
michael@0 314 return fPtr;
michael@0 315 diff --git a/gfx/skia/include/effects/SkLayerDrawLooper.h b/gfx/skia/include/effects/SkLayerDrawLooper.h
michael@0 316 --- a/gfx/skia/include/effects/SkLayerDrawLooper.h
michael@0 317 +++ b/gfx/skia/include/effects/SkLayerDrawLooper.h
michael@0 318 @@ -36,17 +36,17 @@ public:
michael@0 319
michael@0 320 /**
michael@0 321 * Use the layer's paint entirely, with these exceptions:
michael@0 322 * - We never override the draw's paint's text_encoding, since that is
michael@0 323 * used to interpret the text/len parameters in draw[Pos]Text.
michael@0 324 * - Flags and Color are always computed using the LayerInfo's
michael@0 325 * fFlagsMask and fColorMode.
michael@0 326 */
michael@0 327 - kEntirePaint_Bits = -1,
michael@0 328 + kEntirePaint_Bits = -1
michael@0 329
michael@0 330 };
michael@0 331 typedef int32_t BitFlags;
michael@0 332
michael@0 333 /**
michael@0 334 * Info for how to apply the layer's paint and offset.
michael@0 335 *
michael@0 336 * fFlagsMask selects which flags in the layer's paint should be applied.
michael@0 337 diff --git a/gfx/skia/src/core/SkBitmap.cpp b/gfx/skia/src/core/SkBitmap.cpp
michael@0 338 --- a/gfx/skia/src/core/SkBitmap.cpp
michael@0 339 +++ b/gfx/skia/src/core/SkBitmap.cpp
michael@0 340 @@ -1357,17 +1357,17 @@ bool SkBitmap::extractAlpha(SkBitmap* ds
michael@0 341
michael@0 342 ///////////////////////////////////////////////////////////////////////////////
michael@0 343
michael@0 344 enum {
michael@0 345 SERIALIZE_PIXELTYPE_NONE,
michael@0 346 SERIALIZE_PIXELTYPE_RAW_WITH_CTABLE,
michael@0 347 SERIALIZE_PIXELTYPE_RAW_NO_CTABLE,
michael@0 348 SERIALIZE_PIXELTYPE_REF_DATA,
michael@0 349 - SERIALIZE_PIXELTYPE_REF_PTR,
michael@0 350 + SERIALIZE_PIXELTYPE_REF_PTR
michael@0 351 };
michael@0 352
michael@0 353 static void writeString(SkFlattenableWriteBuffer& buffer, const char str[]) {
michael@0 354 size_t len = strlen(str);
michael@0 355 buffer.write32(len);
michael@0 356 buffer.writePad(str, len);
michael@0 357 }
michael@0 358
michael@0 359 diff --git a/gfx/skia/src/core/SkMatrix.cpp b/gfx/skia/src/core/SkMatrix.cpp
michael@0 360 --- a/gfx/skia/src/core/SkMatrix.cpp
michael@0 361 +++ b/gfx/skia/src/core/SkMatrix.cpp
michael@0 362 @@ -1715,17 +1715,17 @@ SkScalar SkMatrix::getMaxStretch() const
michael@0 363 const SkMatrix& SkMatrix::I() {
michael@0 364 static SkMatrix gIdentity;
michael@0 365 static bool gOnce;
michael@0 366 if (!gOnce) {
michael@0 367 gIdentity.reset();
michael@0 368 gOnce = true;
michael@0 369 }
michael@0 370 return gIdentity;
michael@0 371 -};
michael@0 372 +}
michael@0 373
michael@0 374 const SkMatrix& SkMatrix::InvalidMatrix() {
michael@0 375 static SkMatrix gInvalid;
michael@0 376 static bool gOnce;
michael@0 377 if (!gOnce) {
michael@0 378 gInvalid.setAll(SK_ScalarMax, SK_ScalarMax, SK_ScalarMax,
michael@0 379 SK_ScalarMax, SK_ScalarMax, SK_ScalarMax,
michael@0 380 SK_ScalarMax, SK_ScalarMax, SK_ScalarMax);

Mercurial Repository: The Tor Browser

Europalab SCM Repository Server

mercurial