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

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

Issue 1829403002: Clean up font loading (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@Resource_status
Patch Set: Address hiroshige's comments 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/FontFace.cpp
diff --git a/third_party/WebKit/Source/core/css/FontFace.cpp b/third_party/WebKit/Source/core/css/FontFace.cpp
index c4891dc093f4c5d2e56df7b5bf4d21d3efa078f0..59b526bbd633ddfb8043f35a64a24294a1792013 100644
--- a/third_party/WebKit/Source/core/css/FontFace.cpp
+++ b/third_party/WebKit/Source/core/css/FontFace.cpp
@@ -395,7 +395,6 @@ void FontFace::loadInternal(ExecutionContext* context)
return;
m_cssFontFace->load();
- toDocument(context)->styleEngine().fontSelector()->fontLoader()->loadPendingFonts();
}
FontTraits FontFace::traits() const
@@ -592,8 +591,8 @@ void FontFace::initCSSFontFace(Document* document, CSSValue* src)
if (allowDownloading && item->isSupportedFormat() && document) {
FontResource* fetched = item->fetch(document);
if (fetched) {
- FontLoader* fontLoader = document->styleEngine().fontSelector()->fontLoader();
- source = new RemoteFontFaceSource(fetched, fontLoader, CSSValueToFontDisplay(m_display.get()));
+ CSSFontSelector* fontSelector = document->styleEngine().fontSelector();
+ source = new RemoteFontFaceSource(fetched, fontSelector, CSSValueToFontDisplay(m_display.get()));
}
}
} else {

Powered by Google App Engine
This is Rietveld 408576698