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

Unified Diff: sky/engine/core/css/CSSFontSelector.cpp

Issue 723343002: Update from https://crrev.com/304121 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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 | « skia/skia_chrome.gypi ('k') | sky/engine/platform/fonts/FontCache.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/css/CSSFontSelector.cpp
diff --git a/sky/engine/core/css/CSSFontSelector.cpp b/sky/engine/core/css/CSSFontSelector.cpp
index 2b81458dc617777bf4a8ea3d7fcff90b024ff69b..a45b8765268bf02c54f6ac6a0a1592582ddea043 100644
--- a/sky/engine/core/css/CSSFontSelector.cpp
+++ b/sky/engine/core/css/CSSFontSelector.cpp
@@ -97,15 +97,15 @@ void CSSFontSelector::fontCacheInvalidated()
static AtomicString familyNameFromSettings(const GenericFontFamilySettings& settings, const FontDescription& fontDescription, const AtomicString& genericFamilyName)
{
- UScriptCode script = fontDescription.script();
-
#if OS(ANDROID)
if (fontDescription.genericFamily() == FontDescription::StandardFamily)
- return FontCache::getGenericFamilyNameForScript(FontFamilyNames::webkit_standard, script);
+ return FontCache::getGenericFamilyNameForScript(FontFamilyNames::webkit_standard, fontDescription);
if (genericFamilyName.startsWith("-webkit-"))
- return FontCache::getGenericFamilyNameForScript(genericFamilyName, script);
+ return FontCache::getGenericFamilyNameForScript(genericFamilyName, fontDescription);
#else
+ UScriptCode script = fontDescription.script();
+
if (fontDescription.genericFamily() == FontDescription::StandardFamily)
return settings.standard(script);
if (genericFamilyName == FontFamilyNames::webkit_serif)
« no previous file with comments | « skia/skia_chrome.gypi ('k') | sky/engine/platform/fonts/FontCache.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698