| Index: Source/platform/fonts/SimpleFontData.h
|
| diff --git a/Source/platform/fonts/SimpleFontData.h b/Source/platform/fonts/SimpleFontData.h
|
| index e36b6c954af6504fc9b3085a75da282319a8ce56..1452f919a5b960064324bab57ec9ae77c1d36513 100644
|
| --- a/Source/platform/fonts/SimpleFontData.h
|
| +++ b/Source/platform/fonts/SimpleFontData.h
|
| @@ -69,9 +69,7 @@ public:
|
| static const SimpleFontData* systemFallback() { return reinterpret_cast<const SimpleFontData*>(-1); }
|
|
|
| const FontPlatformData& platformData() const { return m_platformData; }
|
| -#if ENABLE(OPENTYPE_VERTICAL)
|
| const OpenTypeVerticalData* verticalData() const { return m_verticalData.get(); }
|
| -#endif
|
|
|
| PassRefPtr<SimpleFontData> smallCapsFontData(const FontDescription&) const;
|
| PassRefPtr<SimpleFontData> emphasisMarkFontData(const FontDescription&) const;
|
| @@ -192,9 +190,7 @@ private:
|
|
|
| bool m_isTextOrientationFallback;
|
| bool m_isBrokenIdeographFallback;
|
| -#if ENABLE(OPENTYPE_VERTICAL)
|
| RefPtr<OpenTypeVerticalData> m_verticalData;
|
| -#endif
|
| bool m_hasVerticalGlyphs;
|
|
|
| Glyph m_spaceGlyph;
|
| @@ -269,14 +265,12 @@ ALWAYS_INLINE float SimpleFontData::widthForGlyph(Glyph glyph) const
|
|
|
| if (isSVGFont())
|
| width = m_customFontData->widthForSVGGlyph(glyph, m_platformData.size());
|
| -#if ENABLE(OPENTYPE_VERTICAL)
|
| else if (m_verticalData)
|
| #if OS(MACOSX)
|
| width = m_verticalData->advanceHeight(this, glyph) + m_syntheticBoldOffset;
|
| #else
|
| width = m_verticalData->advanceHeight(this, glyph);
|
| #endif
|
| -#endif
|
| else
|
| width = platformWidthForGlyph(glyph);
|
|
|
|
|