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 96ffcdc598288ac96cd9518b653cd8754bce4c39..11759e3fee8916c6422eaa4f143375b9b73e8742 100644 |
--- a/third_party/WebKit/Source/core/css/FontFaceSet.cpp |
+++ b/third_party/WebKit/Source/core/css/FontFaceSet.cpp |
@@ -136,8 +136,8 @@ bool FontFaceSet::inActiveDocumentContext() const { |
return context && toDocument(context)->isActive(); |
} |
-void FontFaceSet::addFontFacesToFontFaceCache(CSSFontSelector* fontSelector) { |
- FontFaceCache* fontFaceCache = document()->fontFaceCache(); |
+void FontFaceSet::addFontFacesToFontFaceCache(FontFaceCache* fontFaceCache, |
+ CSSFontSelector* fontSelector) { |
for (const auto& fontFace : m_nonCSSConnectedFaces) |
fontFaceCache->addFontFace(fontSelector, fontFace, false); |
} |
@@ -258,7 +258,7 @@ FontFaceSet* FontFaceSet::addForBinding(ScriptState*, |
return this; |
CSSFontSelector* fontSelector = document()->styleEngine().fontSelector(); |
m_nonCSSConnectedFaces.add(fontFace); |
- document()->fontFaceCache()->addFontFace(fontSelector, fontFace, false); |
+ fontSelector->fontFaceCache()->addFontFace(fontSelector, fontFace, false); |
if (fontFace->loadStatus() == FontFace::Loading) |
addToLoadingFonts(fontFace); |
fontSelector->fontFaceInvalidated(); |
@@ -269,7 +269,7 @@ void FontFaceSet::clearForBinding(ScriptState*, ExceptionState&) { |
if (!inActiveDocumentContext() || m_nonCSSConnectedFaces.isEmpty()) |
return; |
CSSFontSelector* fontSelector = document()->styleEngine().fontSelector(); |
- FontFaceCache* fontFaceCache = document()->fontFaceCache(); |
+ FontFaceCache* fontFaceCache = fontSelector->fontFaceCache(); |
for (const auto& fontFace : m_nonCSSConnectedFaces) { |
fontFaceCache->removeFontFace(fontFace.get(), false); |
if (fontFace->loadStatus() == FontFace::Loading) |
@@ -290,7 +290,7 @@ bool FontFaceSet::deleteForBinding(ScriptState*, |
if (it != m_nonCSSConnectedFaces.end()) { |
m_nonCSSConnectedFaces.remove(it); |
CSSFontSelector* fontSelector = document()->styleEngine().fontSelector(); |
- document()->fontFaceCache()->removeFontFace(fontFace, false); |
+ fontSelector->fontFaceCache()->removeFontFace(fontFace, false); |
if (fontFace->loadStatus() == FontFace::Loading) |
removeFromLoadingFonts(fontFace); |
fontSelector->fontFaceInvalidated(); |
@@ -313,7 +313,10 @@ const HeapListHashSet<Member<FontFace>>& FontFaceSet::cssConnectedFontFaceList() |
const { |
Document* document = this->document(); |
document->updateActiveStyle(); |
- return document->fontFaceCache()->cssConnectedFontFaces(); |
+ return document->styleEngine() |
+ .fontSelector() |
+ ->fontFaceCache() |
+ ->cssConnectedFontFaces(); |
} |
bool FontFaceSet::isCSSConnectedFontFace(FontFace* fontFace) const { |
@@ -378,7 +381,8 @@ ScriptPromise FontFaceSet::load(ScriptState* scriptState, |
return promise; |
} |
- FontFaceCache* fontFaceCache = document()->fontFaceCache(); |
+ FontFaceCache* fontFaceCache = |
+ document()->styleEngine().fontSelector()->fontFaceCache(); |
FontFaceArray faces; |
for (const FontFamily* f = &font.getFontDescription().family(); f; |
f = f->next()) { |
@@ -410,7 +414,7 @@ bool FontFaceSet::check(const String& fontString, |
} |
CSSFontSelector* fontSelector = document()->styleEngine().fontSelector(); |
- FontFaceCache* fontFaceCache = document()->fontFaceCache(); |
+ FontFaceCache* fontFaceCache = fontSelector->fontFaceCache(); |
bool hasLoadedFaces = false; |
for (const FontFamily* f = &font.getFontDescription().family(); f; |