Index: Source/platform/fonts/FontPlatformData.h |
diff --git a/Source/platform/fonts/FontPlatformData.h b/Source/platform/fonts/FontPlatformData.h |
index fcfa63c80b9900b624257a62c68edc2a3d447d72..891602545d5e2da9bbf8c9f065794b3e540fcd10 100644 |
--- a/Source/platform/fonts/FontPlatformData.h |
+++ b/Source/platform/fonts/FontPlatformData.h |
@@ -76,13 +76,13 @@ |
FontPlatformData(); |
FontPlatformData(const FontPlatformData&); |
FontPlatformData(float size, bool syntheticBold, bool syntheticItalic, FontOrientation = Horizontal, FontWidthVariant = RegularWidth); |
- 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, float size, bool syntheticBold, bool syntheticOblique, FontOrientation, FontWidthVariant); |
#else |
FontPlatformData(PassRefPtr<SkTypeface>, const char* name, float textSize, bool syntheticBold, bool syntheticItalic, FontOrientation = Horizontal, bool subpixelTextPosition = defaultUseSubpixelPositioning()); |
+ FontPlatformData(const FontPlatformData& src, float textSize); |
#endif |
~FontPlatformData(); |
@@ -142,8 +142,8 @@ |
#if !OS(MACOSX) |
// The returned styles are all actual styles without FontRenderStyle::NoPreference. |
const FontRenderStyle& fontRenderStyle() const { return m_style; } |
-#endif |
void setupPaint(SkPaint*, GraphicsContext* = 0) const; |
+#endif |
#if OS(WIN) |
int paintTextFlags() const { return m_paintTextFlags; } |