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

Unified Diff: Source/core/style/ComputedStyle.cpp

Issue 1130913007: Removing primaryFontHasGlyphForCharacter method (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase patch Created 5 years, 7 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 | « no previous file | Source/platform/fonts/Font.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/style/ComputedStyle.cpp
diff --git a/Source/core/style/ComputedStyle.cpp b/Source/core/style/ComputedStyle.cpp
index 0d17e0807421c34b9c62b6dfb2c6333563dc27c1..c01ddf928a2c652f6b556d64357ec39ae634dc64 100644
--- a/Source/core/style/ComputedStyle.cpp
+++ b/Source/core/style/ComputedStyle.cpp
@@ -1128,7 +1128,9 @@ const AtomicString& ComputedStyle::hyphenString() const
// FIXME: This should depend on locale.
DEFINE_STATIC_LOCAL(AtomicString, hyphenMinusString, (&hyphenMinusCharacter, 1));
DEFINE_STATIC_LOCAL(AtomicString, hyphenString, (&hyphenCharacter, 1));
- return font().primaryFontHasGlyphForCharacter(hyphenCharacter) ? hyphenString : hyphenMinusString;
+ const SimpleFontData* primaryFont = font().primaryFont();
+ ASSERT(primaryFont);
+ return primaryFont->glyphForCharacter(hyphenCharacter) ? hyphenString : hyphenMinusString;
}
const AtomicString& ComputedStyle::textEmphasisMarkString() const
« no previous file with comments | « no previous file | Source/platform/fonts/Font.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698