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

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

Issue 1201143002: Removing broken ideograph font variant (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Updating TestExpectations Created 5 years, 6 months 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/SimpleFontData.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/platform/fonts/SimpleFontData.cpp
diff --git a/Source/platform/fonts/SimpleFontData.cpp b/Source/platform/fonts/SimpleFontData.cpp
index 823055e8f588a86557d1c40ace63c8e25a3e009d..d2a6beb1a417930d2ef558339116b518e6971b7f 100644
--- a/Source/platform/fonts/SimpleFontData.cpp
+++ b/Source/platform/fonts/SimpleFontData.cpp
@@ -59,7 +59,6 @@ SimpleFontData::SimpleFontData(const FontPlatformData& platformData, PassRefPtr<
, m_avgCharWidth(-1)
, m_platformData(platformData)
, m_isTextOrientationFallback(isTextOrientationFallback)
- , m_isBrokenIdeographFallback(false)
, m_verticalData(nullptr)
, m_hasVerticalGlyphs(false)
, m_customFontData(customData)
@@ -75,7 +74,6 @@ SimpleFontData::SimpleFontData(const FontPlatformData& platformData, PassRefPtr<
SimpleFontData::SimpleFontData(PassRefPtr<CustomFontData> customData, float fontSize, bool syntheticBold, bool syntheticItalic)
: m_platformData(FontPlatformData(fontSize, syntheticBold, syntheticItalic))
, m_isTextOrientationFallback(false)
- , m_isBrokenIdeographFallback(false)
, m_verticalData(nullptr)
, m_hasVerticalGlyphs(false)
, m_customFontData(customData)
@@ -367,17 +365,6 @@ PassRefPtr<SimpleFontData> SimpleFontData::emphasisMarkFontData(const FontDescri
return m_derivedFontData->emphasisMark;
}
-PassRefPtr<SimpleFontData> SimpleFontData::brokenIdeographFontData() const
-{
- if (!m_derivedFontData)
- m_derivedFontData = DerivedFontData::create(isCustomFont());
- if (!m_derivedFontData->brokenIdeograph) {
- m_derivedFontData->brokenIdeograph = create(m_platformData, isCustomFont() ? CustomFontData::create(): nullptr);
- m_derivedFontData->brokenIdeograph->m_isBrokenIdeographFallback = true;
- }
- return m_derivedFontData->brokenIdeograph;
-}
-
PassOwnPtr<SimpleFontData::DerivedFontData> SimpleFontData::DerivedFontData::create(bool forCustomFont)
{
return adoptPtr(new DerivedFontData(forCustomFont));
@@ -392,8 +379,6 @@ SimpleFontData::DerivedFontData::~DerivedFontData()
GlyphPageTreeNode::pruneTreeCustomFontData(smallCaps.get());
if (emphasisMark)
GlyphPageTreeNode::pruneTreeCustomFontData(emphasisMark.get());
- if (brokenIdeograph)
- GlyphPageTreeNode::pruneTreeCustomFontData(brokenIdeograph.get());
if (verticalRightOrientation)
GlyphPageTreeNode::pruneTreeCustomFontData(verticalRightOrientation.get());
if (uprightOrientation)
« no previous file with comments | « Source/platform/fonts/SimpleFontData.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698