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

Unified Diff: sky/engine/core/css/FontFaceSet.cpp

Issue 838003008: Get rid of ensureStyleResolver(). (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 11 months 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 | sky/engine/core/css/resolver/ScopedStyleResolver.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/css/FontFaceSet.cpp
diff --git a/sky/engine/core/css/FontFaceSet.cpp b/sky/engine/core/css/FontFaceSet.cpp
index afd6c7e2dae0685c5810239b6f20c2621a73e6f2..b42eefa501dc93e4a18332f0463d411181bbb268 100644
--- a/sky/engine/core/css/FontFaceSet.cpp
+++ b/sky/engine/core/css/FontFaceSet.cpp
@@ -340,7 +340,6 @@ bool FontFaceSet::has(FontFace* fontFace, ExceptionState& exceptionState) const
const ListHashSet<RefPtr<FontFace> >& FontFaceSet::cssConnectedFontFaceList() const
{
Document* d = document();
- d->ensureStyleResolver(); // Flush pending style changes.
return d->styleEngine()->fontSelector()->fontFaceCache()->cssConnectedFontFaces();
}
@@ -527,7 +526,7 @@ bool FontFaceSet::resolveFontStyle(const String& fontString, Font& font)
CSSPropertyValue(CSSPropertyFontSize, *parsedStyle),
CSSPropertyValue(CSSPropertyLineHeight, *parsedStyle),
};
- StyleResolver& styleResolver = document()->ensureStyleResolver();
+ StyleResolver& styleResolver = document()->styleResolver();
styleResolver.applyPropertiesToStyle(properties, WTF_ARRAY_LENGTH(properties), style.get());
font = style->font();
« no previous file with comments | « no previous file | sky/engine/core/css/resolver/ScopedStyleResolver.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698