Index: Source/platform/fonts/SimpleFontData.h |
diff --git a/Source/platform/fonts/SimpleFontData.h b/Source/platform/fonts/SimpleFontData.h |
index eeb53eef39bf54cef0b43788b3b8fd48c02114e0..040a13c9ecbf282f5d68550a0e6029029a21bb07 100644 |
--- a/Source/platform/fonts/SimpleFontData.h |
+++ b/Source/platform/fonts/SimpleFontData.h |
@@ -61,9 +61,7 @@ public: |
virtual ~SimpleFontData(); |
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; |
@@ -170,9 +168,7 @@ private: |
bool m_isTextOrientationFallback; |
bool m_isBrokenIdeographFallback; |
-#if ENABLE(OPENTYPE_VERTICAL) |
RefPtr<OpenTypeVerticalData> m_verticalData; |
-#endif |
bool m_hasVerticalGlyphs; |
Glyph m_spaceGlyph; |
@@ -235,12 +231,7 @@ ALWAYS_INLINE float SimpleFontData::widthForGlyph(Glyph glyph) const |
if (width != cGlyphSizeUnknown) |
return width; |
-#if ENABLE(OPENTYPE_VERTICAL) |
- if (m_verticalData) |
- width = m_verticalData->advanceHeight(this, glyph); |
- else |
-#endif |
- width = platformWidthForGlyph(glyph); |
+ width = platformWidthForGlyph(glyph); |
m_glyphToWidthMap.setMetricsForGlyph(glyph, width); |
return width; |