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

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

Issue 87503003: Moving fontSelector from StyleResolver to StyleEngine. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Reverted hasAnyFontFaceRule Created 7 years, 1 month 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 | « no previous file | Source/core/css/resolver/StyleResolver.h » ('j') | Source/core/dom/Document.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
}
« no previous file with comments | « no previous file | Source/core/css/resolver/StyleResolver.h » ('j') | Source/core/dom/Document.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698