Index: Source/core/css/FontFaceSet.cpp |
diff --git a/Source/core/css/FontFaceSet.cpp b/Source/core/css/FontFaceSet.cpp |
index dd501ca569309eb3cb4cfc108391cade7d68fac6..288e264d75b1a33ac4b6a7824868183d28d0a5b5 100644 |
--- a/Source/core/css/FontFaceSet.cpp |
+++ b/Source/core/css/FontFaceSet.cpp |
@@ -339,7 +339,7 @@ Vector<RefPtr<FontFace> > FontFaceSet::match(const String& fontString, const Str |
} |
for (const FontFamily* f = &font.family(); f; f = f->next()) { |
- CSSSegmentedFontFace* face = document()->styleResolver()->fontSelector()->getFontFace(font.fontDescription(), f->family()); |
+ CSSSegmentedFontFace* face = document()->fontSelector()->getFontFace(font.fontDescription(), f->family()); |
if (face) |
matchedFonts.append(face->fontFaces(nullToSpace(text))); |
} |
@@ -358,7 +358,7 @@ ScriptPromise FontFaceSet::load(const String& fontString, const String& text, Ex |
ScriptPromise promise = ScriptPromise::createPending(executionContext()); |
RefPtr<LoadFontPromiseResolver> resolver = LoadFontPromiseResolver::create(font.family(), promise, executionContext()); |
for (const FontFamily* f = &font.family(); f; f = f->next()) { |
- CSSSegmentedFontFace* face = d->styleResolver()->fontSelector()->getFontFace(font.fontDescription(), f->family()); |
+ CSSSegmentedFontFace* face = d->fontSelector()->getFontFace(font.fontDescription(), f->family()); |
if (!face) { |
resolver->error(d); |
continue; |
@@ -377,7 +377,7 @@ bool FontFaceSet::check(const String& fontString, const String& text, ExceptionS |
} |
for (const FontFamily* f = &font.family(); f; f = f->next()) { |
- CSSSegmentedFontFace* face = document()->styleResolver()->fontSelector()->getFontFace(font.fontDescription(), f->family()); |
+ CSSSegmentedFontFace* face = document()->fontSelector()->getFontFace(font.fontDescription(), f->family()); |
if (!face || !face->checkFont(nullToSpace(text))) |
return false; |
} |
@@ -426,7 +426,7 @@ bool FontFaceSet::resolveFontStyle(const String& fontString, Font& font) |
styleResolver->applyPropertiesToStyle(properties, WTF_ARRAY_LENGTH(properties), style.get()); |
font = style->font(); |
- font.update(styleResolver->fontSelector()); |
+ font.update(document()->fontSelector()); |
return true; |
} |