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

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

Issue 307243002: Fix font family based fallback font selection (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Windows link fix. Created 6 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/FontDescription.h ('k') | Source/platform/fonts/FontFaceCreationParams.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/platform/fonts/FontDescription.cpp
diff --git a/Source/platform/fonts/FontDescription.cpp b/Source/platform/fonts/FontDescription.cpp
index 4f84d9f0cc0e56498d016f843c5fd3ee7e361b4a..49d735800de4be3b8b4d3aed03d87d6cba4a9584 100644
--- a/Source/platform/fonts/FontDescription.cpp
+++ b/Source/platform/fonts/FontDescription.cpp
@@ -127,7 +127,7 @@ float FontDescription::effectiveFontSize() const
return floorf(size * FontCacheKey::precisionMultiplier()) / FontCacheKey::precisionMultiplier();
}
-FontCacheKey FontDescription::cacheKey(const AtomicString& familyName, FontTraits desiredTraits) const
+FontCacheKey FontDescription::cacheKey(const FontFaceCreationParams& creationParams, FontTraits desiredTraits) const
{
FontTraits fontTraits = desiredTraits.mask()
? desiredTraits
@@ -141,7 +141,7 @@ FontCacheKey FontDescription::cacheKey(const AtomicString& familyName, FontTrait
static_cast<unsigned>(m_orientation) << 1 | // bit 2
static_cast<unsigned>(m_subpixelTextPosition); // bit 1
- return FontCacheKey(familyName, effectiveFontSize(), options | fontTraits.mask() << 8);
+ return FontCacheKey(creationParams, effectiveFontSize(), options | fontTraits.mask() << 8);
}
« no previous file with comments | « Source/platform/fonts/FontDescription.h ('k') | Source/platform/fonts/FontFaceCreationParams.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698