| Index: Source/platform/fonts/FontPlatformData.h
|
| diff --git a/Source/platform/fonts/FontPlatformData.h b/Source/platform/fonts/FontPlatformData.h
|
| index 51ed7a64841545a9bb0c9ca34f8b98b60ad6a8a4..a2784c0b25de1840fac4741b42c4496e978ab30d 100644
|
| --- a/Source/platform/fonts/FontPlatformData.h
|
| +++ b/Source/platform/fonts/FontPlatformData.h
|
| @@ -76,12 +76,11 @@ public:
|
| FontPlatformData(WTF::HashTableDeletedValueType);
|
| FontPlatformData();
|
| FontPlatformData(const FontPlatformData&);
|
| - FontPlatformData(float size, bool syntheticBold, bool syntheticItalic, FontOrientation = Horizontal, FontWidthVariant = RegularWidth);
|
| + FontPlatformData(float size, bool syntheticBold, bool syntheticItalic, FontOrientation = Horizontal);
|
| FontPlatformData(const FontPlatformData& src, float textSize);
|
| #if OS(MACOSX)
|
| - FontPlatformData(NSFont*, float size, bool syntheticBold = false, bool syntheticItalic = false,
|
| - FontOrientation = Horizontal, FontWidthVariant = RegularWidth);
|
| - FontPlatformData(CGFontRef, PassRefPtr<SkTypeface>, float size, bool syntheticBold, bool syntheticOblique, FontOrientation, FontWidthVariant);
|
| + FontPlatformData(NSFont*, float size, bool syntheticBold = false, bool syntheticItalic = false, FontOrientation = Horizontal);
|
| + FontPlatformData(CGFontRef, PassRefPtr<SkTypeface>, float size, bool syntheticBold, bool syntheticOblique, FontOrientation);
|
| #else
|
| FontPlatformData(PassRefPtr<SkTypeface>, const char* name, float textSize, bool syntheticBold, bool syntheticItalic, FontOrientation = Horizontal, bool subpixelTextPosition = defaultUseSubpixelPositioning());
|
| #endif
|
| @@ -99,8 +98,6 @@ public:
|
|
|
| bool isColorBitmapFont() const { return m_isColorBitmapFont; }
|
| bool isCompositeFontReference() const { return m_isCompositeFontReference; }
|
| -
|
| - FontWidthVariant widthVariant() const { return m_widthVariant; }
|
| #endif
|
|
|
| String fontFamilyName() const;
|
| @@ -187,7 +184,6 @@ public:
|
| bool m_isColorBitmapFont;
|
| bool m_isCompositeFontReference;
|
| #endif
|
| - FontWidthVariant m_widthVariant;
|
| private:
|
| #if OS(MACOSX)
|
| NSFont* m_font;
|
|
|