wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 755869 - [7] Re-apply bug 722011 - Fix trailing commas at end of enum lists r=mattwoodrow

Browse Source
This commit is contained in:
George Wright 2012-05-18 14:15:28 -04:00
parent da8d99e005
commit 5fa822b2a5
14 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gfx/skia/include/core/SkAdvancedTypefaceMetrics.h
View File

@ -34,7 +34,7 @@ public:
kCFF_Font,
kTrueType_Font,
kOther_Font,
kNotEmbeddable_Font,
kNotEmbeddable_Font
};
// The type of the underlying font program. This field determines which
// of the following fields are valid. If it is kOther_Font or
@ -56,7 +56,7 @@ public:
kItalic_Style = 0x00040,
kAllCaps_Style = 0x10000,
kSmallCaps_Style = 0x20000,
kForceBold_Style = 0x40000,
kForceBold_Style = 0x40000
};
uint16_t fStyle; // Font style characteristics.
int16_t fItalicAngle; // Counterclockwise degrees from vertical of the
@ -75,7 +75,7 @@ public:
kHAdvance_PerGlyphInfo = 0x1, // Populate horizontal advance data.
kVAdvance_PerGlyphInfo = 0x2, // Populate vertical advance data.
kGlyphNames_PerGlyphInfo = 0x4, // Populate glyph names (Type 1 only).
kToUnicode_PerGlyphInfo = 0x8, // Populate ToUnicode table, ignored
kToUnicode_PerGlyphInfo = 0x8 // Populate ToUnicode table, ignored
// for Type 1 fonts
};
@ -84,7 +84,7 @@ public:
enum MetricType {
kDefault, // Default advance: fAdvance.count = 1
kRange, // Advances for a range: fAdvance.count = fEndID-fStartID
kRun, // fStartID-fEndID have same advance: fAdvance.count = 1
kRun // fStartID-fEndID have same advance: fAdvance.count = 1
};
MetricType fType;
uint16_t fStartId;

2
gfx/skia/include/core/SkBlitRow.h
View File

@ -42,7 +42,7 @@ public:
enum Flags32 {
kGlobalAlpha_Flag32 = 1 << 0,
kSrcPixelAlpha_Flag32 = 1 << 1,
kSrcPixelAlpha_Flag32 = 1 << 1
};
/** Function pointer that blends 32bit colors onto a 32bit destination.

2
gfx/skia/include/core/SkCanvas.h
View File

@ -148,7 +148,7 @@ public:
* low byte to high byte: R, G, B, A.
*/
kRGBA_Premul_Config8888,
kRGBA_Unpremul_Config8888,
kRGBA_Unpremul_Config8888
};
/**

2
gfx/skia/include/core/SkDevice.h
View File

@ -139,7 +139,7 @@ public:
protected:
enum Usage {
kGeneral_Usage,
kSaveLayer_Usage, // <! internal use only
kSaveLayer_Usage // <! internal use only
};
struct TextFlags {

4
gfx/skia/include/core/SkDeviceProfile.h
View File

@ -17,7 +17,7 @@ public:
kRGB_Horizontal_LCDConfig,
kBGR_Horizontal_LCDConfig,
kRGB_Vertical_LCDConfig,
kBGR_Vertical_LCDConfig,
kBGR_Vertical_LCDConfig
};
enum FontHintLevel {
@ -25,7 +25,7 @@ public:
kSlight_FontHintLevel,
kNormal_FontHintLevel,
kFull_FontHintLevel,
kAuto_FontHintLevel,
kAuto_FontHintLevel
};
/**

2
gfx/skia/include/core/SkFlattenable.h
View File

@ -272,7 +272,7 @@ public:
* Instructs the writer to inline Factory names as there are seen the
* first time (after that we store an index). The pipe code uses this.
*/
kInlineFactoryNames_Flag = 0x02,
kInlineFactoryNames_Flag = 0x02
};
Flags getFlags() const { return (Flags)fFlags; }
void setFlags(Flags flags) { fFlags = flags; }

4
gfx/skia/include/core/SkFontHost.h
View File

@ -240,7 +240,7 @@ public:
*/
enum LCDOrientation {
kHorizontal_LCDOrientation = 0, //!< this is the default
kVertical_LCDOrientation = 1,
kVertical_LCDOrientation = 1
};
static void SetSubpixelOrientation(LCDOrientation orientation);
@ -259,7 +259,7 @@ public:
enum LCDOrder {
kRGB_LCDOrder = 0, //!< this is the default
kBGR_LCDOrder = 1,
kNONE_LCDOrder = 2,
kNONE_LCDOrder = 2
};
static void SetSubpixelOrder(LCDOrder order);

2
gfx/skia/include/core/SkMaskFilter.h
View File

@ -61,7 +61,7 @@ public:
kNormal_BlurType, //!< fuzzy inside and outside
kSolid_BlurType, //!< solid inside, fuzzy outside
kOuter_BlurType, //!< nothing inside, fuzzy outside
kInner_BlurType, //!< fuzzy inside, nothing outside
kInner_BlurType //!< fuzzy inside, nothing outside
};
struct BlurInfo {

4
gfx/skia/include/core/SkPaint.h
View File

@ -76,7 +76,7 @@ public:
kNo_Hinting = 0,
kSlight_Hinting = 1,
kNormal_Hinting = 2, //!< this is the default
kFull_Hinting = 3,
kFull_Hinting = 3
};
Hinting getHinting() const {
@ -289,7 +289,7 @@ public:
kStroke_Style, //!< stroke the geometry
kStrokeAndFill_Style, //!< fill and stroke the geometry
kStyleCount,
kStyleCount
};
/** Return the paint's style, used for controlling how primitives'

9
gfx/skia/include/core/SkScalerContext.h
View File

@ -182,21 +182,22 @@ public:
kGenA8FromLCD_Flag = 0x0800,
#ifdef SK_USE_COLOR_LUMINANCE
kLuminance_Bits = 3,
kLuminance_Bits = 3
#else
// luminance : 0 for black text, kLuminance_Max for white text
kLuminance_Shift = 13, // shift to land in the high 3-bits of Flags
kLuminance_Bits = 3, // ensure Flags doesn't exceed 16bits
kLuminance_Bits = 3 // ensure Flags doesn't exceed 16bits
#endif
};
// computed values
enum {
kHinting_Mask = kHintingBit1_Flag | kHintingBit2_Flag,
#ifdef SK_USE_COLOR_LUMINANCE
kHinting_Mask = kHintingBit1_Flag | kHintingBit2_Flag
#else
kHinting_Mask = kHintingBit1_Flag | kHintingBit2_Flag,
kLuminance_Max = (1 << kLuminance_Bits) - 1,
kLuminance_Mask = kLuminance_Max << kLuminance_Shift,
kLuminance_Mask = kLuminance_Max << kLuminance_Shift
#endif
};

2
gfx/skia/include/core/SkTypes.h
View File

@ -438,7 +438,7 @@ public:
* current block is dynamically allocated, just return the old
* block.
*/
kReuse_OnShrink,
kReuse_OnShrink
};
/**

2
gfx/skia/include/effects/SkLayerDrawLooper.h
View File

@ -41,7 +41,7 @@ public:
* - Flags and Color are always computed using the LayerInfo's
* fFlagsMask and fColorMode.
*/
kEntirePaint_Bits = -1,
kEntirePaint_Bits = -1
};
typedef int32_t BitFlags;

2
gfx/skia/src/core/SkBitmap.cpp
View File

@ -1376,7 +1376,7 @@ enum {
SERIALIZE_PIXELTYPE_RAW_WITH_CTABLE,
SERIALIZE_PIXELTYPE_RAW_NO_CTABLE,
SERIALIZE_PIXELTYPE_REF_DATA,
SERIALIZE_PIXELTYPE_REF_PTR,
SERIALIZE_PIXELTYPE_REF_PTR
};
/*

2
gfx/skia/src/core/SkGlyphCache.cpp
View File

@ -417,7 +417,7 @@ class SkGlyphCache_Globals {
public:
enum UseMutex {
kNo_UseMutex, // thread-local cache
kYes_UseMutex, // shared cache
kYes_UseMutex // shared cache
};
SkGlyphCache_Globals(UseMutex um) {