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

Unified Diff: third_party/WebKit/Source/core/css/RemoteFontFaceSource.cpp

Issue 1931393002: Introduce typeface cache in blink::FontCache (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: wip: others Created 4 years, 8 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
Index: third_party/WebKit/Source/core/css/RemoteFontFaceSource.cpp
diff --git a/third_party/WebKit/Source/core/css/RemoteFontFaceSource.cpp b/third_party/WebKit/Source/core/css/RemoteFontFaceSource.cpp
index d40bb31c98cc1b6a13912e9240022a8f5676a677..87ee05ffa3597562503e094c148bf731fb2360ea 100644
--- a/third_party/WebKit/Source/core/css/RemoteFontFaceSource.cpp
+++ b/third_party/WebKit/Source/core/css/RemoteFontFaceSource.cpp
@@ -150,9 +150,12 @@ PassRefPtr<SimpleFontData> RemoteFontFaceSource::createFontData(const FontDescri
m_histograms.recordFallbackTime(m_font.get());
return SimpleFontData::create(
- m_font->platformDataFromCustomData(fontDescription.effectiveFontSize(),
- fontDescription.isSyntheticBold(), fontDescription.isSyntheticItalic(),
- fontDescription.orientation()), CustomFontData::create());
+ m_font->platformDataFromCustomData(
+ fontDescription.isSyntheticBold(),
+ fontDescription.isSyntheticItalic(),
+ fontDescription.orientation()),
+ fontDescription.effectiveFontSize(),
+ CustomFontData::create());
}
PassRefPtr<SimpleFontData> RemoteFontFaceSource::createLoadingFallbackFontData(const FontDescription& fontDescription)
@@ -165,7 +168,7 @@ PassRefPtr<SimpleFontData> RemoteFontFaceSource::createLoadingFallbackFontData(c
return nullptr;
}
RefPtr<CSSCustomFontData> cssFontData = CSSCustomFontData::create(this, m_period == BlockPeriod ? CSSCustomFontData::InvisibleFallback : CSSCustomFontData::VisibleFallback);
- return SimpleFontData::create(temporaryFont->platformData(), cssFontData);
+ return SimpleFontData::create(temporaryFont->platformData(), fontDescription.effectiveFontSize(), cssFontData);
}
void RemoteFontFaceSource::beginLoadIfNeeded()
« no previous file with comments | « third_party/WebKit/Source/core/css/BinaryDataFontFaceSource.cpp ('k') | third_party/WebKit/Source/core/fetch/FontResource.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698