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(); |