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

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

Issue 2572473006: Revert of Collect active stylesheets and and apply asynchronously. (Closed)
Patch Set: Created 4 years 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 | « third_party/WebKit/Source/core/BUILD.gn ('k') | third_party/WebKit/Source/core/css/StyleSheetContents.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/css/FontFaceSet.cpp
diff --git a/third_party/WebKit/Source/core/css/FontFaceSet.cpp b/third_party/WebKit/Source/core/css/FontFaceSet.cpp
index f50b821f6b9fad50b507d5c460851f06e8e8bb67..48833a079977f841102207e136ef40f9c784e34e 100644
--- a/third_party/WebKit/Source/core/css/FontFaceSet.cpp
+++ b/third_party/WebKit/Source/core/css/FontFaceSet.cpp
@@ -310,9 +310,9 @@
const HeapListHashSet<Member<FontFace>>& FontFaceSet::cssConnectedFontFaceList()
const {
- Document* document = this->document();
- document->updateActiveStyle();
- return document->styleEngine()
+ Document* d = document();
+ d->ensureStyleResolver(); // Flush pending style changes.
+ return d->styleEngine()
.fontSelector()
->fontFaceCache()
->cssConnectedFontFaces();
@@ -467,7 +467,6 @@
style->font().update(style->font().getFontSelector());
- document()->updateActiveStyle();
document()->ensureStyleResolver().computeFont(style.get(), *parsedStyle);
font = style->font();
« no previous file with comments | « third_party/WebKit/Source/core/BUILD.gn ('k') | third_party/WebKit/Source/core/css/StyleSheetContents.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698