Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1850)

Unified Diff: Source/platform/fonts/SimpleFontData.h

Issue 617103003: Replace ENABLE_OPENTYPE_VERTICAL implementation with HarfBuzz (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@removeOpenTypeVertical
Patch Set: Additional TestExpectations tweaking for Mac Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/platform/fonts/GlyphPageTreeNode.cpp ('k') | Source/platform/fonts/SimpleFontData.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
« no previous file with comments | « Source/platform/fonts/GlyphPageTreeNode.cpp ('k') | Source/platform/fonts/SimpleFontData.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698