| Index: Source/platform/fonts/win/FontPlatformDataWin.cpp
|
| diff --git a/Source/platform/fonts/win/FontPlatformDataWin.cpp b/Source/platform/fonts/win/FontPlatformDataWin.cpp
|
| index 6a0dd2929a324a7843a96b93925ade9966c21c49..cd85a123be0bdadd5f31284b5a83990f4fc0b3c8 100644
|
| --- a/Source/platform/fonts/win/FontPlatformDataWin.cpp
|
| +++ b/Source/platform/fonts/win/FontPlatformDataWin.cpp
|
| @@ -55,8 +55,8 @@ void FontPlatformData::setupPaint(SkPaint* paint, GraphicsContext* context) cons
|
| const float ts = m_textSize >= 0 ? m_textSize : 12;
|
| paint->setTextSize(SkFloatToScalar(m_textSize));
|
| paint->setTypeface(typeface());
|
| - paint->setFakeBoldText(m_fakeBold);
|
| - paint->setTextSkewX(m_fakeItalic ? -SK_Scalar1 / 4 : 0);
|
| + paint->setFakeBoldText(m_syntheticBold);
|
| + paint->setTextSkewX(m_syntheticItalic ? -SK_Scalar1 / 4 : 0);
|
| paint->setSubpixelText(m_useSubpixelPositioning);
|
|
|
| int textFlags = paintTextFlags();
|
| @@ -144,8 +144,8 @@ PassRefPtr<SkTypeface> CreateTypefaceFromHFont(HFONT hfont, int* size)
|
|
|
| FontPlatformData::FontPlatformData(WTF::HashTableDeletedValueType)
|
| : m_textSize(-1)
|
| - , m_fakeBold(false)
|
| - , m_fakeItalic(false)
|
| + , m_syntheticBold(false)
|
| + , m_syntheticItalic(false)
|
| , m_orientation(Horizontal)
|
| , m_typeface(adoptRef(SkTypeface::RefDefault()))
|
| , m_isHashTableDeletedValue(true)
|
| @@ -159,8 +159,8 @@ FontPlatformData::FontPlatformData(WTF::HashTableDeletedValueType)
|
|
|
| FontPlatformData::FontPlatformData()
|
| : m_textSize(0)
|
| - , m_fakeBold(false)
|
| - , m_fakeItalic(false)
|
| + , m_syntheticBold(false)
|
| + , m_syntheticItalic(false)
|
| , m_orientation(Horizontal)
|
| , m_typeface(adoptRef(SkTypeface::RefDefault()))
|
| , m_isHashTableDeletedValue(false)
|
| @@ -176,8 +176,8 @@ FontPlatformData::FontPlatformData()
|
| FontPlatformData::FontPlatformData(HFONT font, float size, FontOrientation orientation)
|
| : m_font(RefCountedHFONT::create(font))
|
| , m_textSize(size)
|
| - , m_fakeBold(false)
|
| - , m_fakeItalic(false)
|
| + , m_syntheticBold(false)
|
| + , m_syntheticItalic(false)
|
| , m_orientation(orientation)
|
| , m_scriptCache(0)
|
| , m_typeface(CreateTypefaceFromHFont(font, 0))
|
| @@ -190,8 +190,8 @@ FontPlatformData::FontPlatformData(HFONT font, float size, FontOrientation orien
|
| // FIXME: this constructor is needed for SVG fonts but doesn't seem to do much
|
| FontPlatformData::FontPlatformData(float size, bool bold, bool oblique)
|
| : m_textSize(size)
|
| - , m_fakeBold(false)
|
| - , m_fakeItalic(false)
|
| + , m_syntheticBold(false)
|
| + , m_syntheticItalic(false)
|
| , m_orientation(Horizontal)
|
| , m_typeface(adoptRef(SkTypeface::RefDefault()))
|
| , m_isHashTableDeletedValue(false)
|
| @@ -205,8 +205,8 @@ FontPlatformData::FontPlatformData(float size, bool bold, bool oblique)
|
|
|
| FontPlatformData::FontPlatformData(const FontPlatformData& data)
|
| : m_textSize(data.m_textSize)
|
| - , m_fakeBold(data.m_fakeBold)
|
| - , m_fakeItalic(data.m_fakeItalic)
|
| + , m_syntheticBold(data.m_syntheticBold)
|
| + , m_syntheticItalic(data.m_syntheticItalic)
|
| , m_orientation(data.m_orientation)
|
| , m_typeface(data.m_typeface)
|
| , m_isHashTableDeletedValue(false)
|
| @@ -220,8 +220,8 @@ FontPlatformData::FontPlatformData(const FontPlatformData& data)
|
|
|
| FontPlatformData::FontPlatformData(const FontPlatformData& data, float textSize)
|
| : m_textSize(textSize)
|
| - , m_fakeBold(data.m_fakeBold)
|
| - , m_fakeItalic(data.m_fakeItalic)
|
| + , m_syntheticBold(data.m_syntheticBold)
|
| + , m_syntheticItalic(data.m_syntheticItalic)
|
| , m_orientation(data.m_orientation)
|
| , m_typeface(data.m_typeface)
|
| , m_isHashTableDeletedValue(false)
|
| @@ -234,11 +234,11 @@ FontPlatformData::FontPlatformData(const FontPlatformData& data, float textSize)
|
| }
|
|
|
| FontPlatformData::FontPlatformData(PassRefPtr<SkTypeface> tf, const char* family,
|
| - float textSize, bool fakeBold, bool fakeItalic, FontOrientation orientation,
|
| + float textSize, bool syntheticBold, bool syntheticItalic, FontOrientation orientation,
|
| bool useSubpixelPositioning)
|
| : m_textSize(textSize)
|
| - , m_fakeBold(fakeBold)
|
| - , m_fakeItalic(fakeItalic)
|
| + , m_syntheticBold(syntheticBold)
|
| + , m_syntheticItalic(syntheticItalic)
|
| , m_orientation(orientation)
|
| , m_typeface(tf)
|
| , m_isHashTableDeletedValue(false)
|
| @@ -261,8 +261,8 @@ FontPlatformData& FontPlatformData::operator=(const FontPlatformData& data)
|
| {
|
| if (this != &data) {
|
| m_textSize = data.m_textSize;
|
| - m_fakeBold = data.m_fakeBold;
|
| - m_fakeItalic = data.m_fakeItalic;
|
| + m_syntheticBold = data.m_syntheticBold;
|
| + m_syntheticItalic = data.m_syntheticItalic;
|
| m_orientation = data.m_orientation;
|
| m_typeface = data.m_typeface;
|
|
|
| @@ -340,8 +340,8 @@ bool FontPlatformData::operator==(const FontPlatformData& a) const
|
| {
|
| return SkTypeface::Equal(m_typeface.get(), a.m_typeface.get())
|
| && m_textSize == a.m_textSize
|
| - && m_fakeBold == a.m_fakeBold
|
| - && m_fakeItalic == a.m_fakeItalic
|
| + && m_syntheticBold == a.m_syntheticBold
|
| + && m_syntheticItalic == a.m_syntheticItalic
|
| && m_orientation == a.m_orientation
|
| && m_isHashTableDeletedValue == a.m_isHashTableDeletedValue;
|
| }
|
|
|