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

Unified Diff: sky/engine/core/css/resolver/StyleResolver.cpp

Issue 852703002: Merge StyleSheetCollection into ScopedStyleResolver. (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 | « sky/engine/core/css/resolver/StyleResolver.h ('k') | sky/engine/core/dom/StyleEngine.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/css/resolver/StyleResolver.cpp
diff --git a/sky/engine/core/css/resolver/StyleResolver.cpp b/sky/engine/core/css/resolver/StyleResolver.cpp
index 5d66a3d93120938d1c0a2dd233aef2ebd7a93a03..0e56a625bc42c39cf689552b15aa5a5c33e46c33 100644
--- a/sky/engine/core/css/resolver/StyleResolver.cpp
+++ b/sky/engine/core/css/resolver/StyleResolver.cpp
@@ -131,33 +131,6 @@ StyleResolver::StyleResolver(Document& document)
}
}
-void StyleResolver::appendCSSStyleSheet(CSSStyleSheet* cssSheet)
-{
- ASSERT(cssSheet);
- if (cssSheet->mediaQueries() && !m_medium->eval(cssSheet->mediaQueries(), &m_viewportDependentMediaQueryResults))
- return;
-
- Node* ownerNode = cssSheet->ownerNode();
- if (!ownerNode)
- return;
-
- TreeScope& treeScope = ownerNode->treeScope();
- treeScope.scopedStyleResolver().addRulesFromSheet(cssSheet);
-
- // FIXME(BUG 72461): We don't add @font-face rules of scoped style sheets for the moment.
- if (ownerNode->isDocumentNode()) {
- CSSFontSelector* fontSelector = document().styleEngine()->fontSelector();
- RuleSet& ruleSet = cssSheet->contents()->ruleSet();
- const Vector<RawPtr<StyleRuleFontFace> > fontFaceRules = ruleSet.fontFaceRules();
- for (unsigned i = 0; i < fontFaceRules.size(); ++i) {
- if (RefPtr<FontFace> fontFace = FontFace::create(&document(), fontFaceRules[i]))
- fontSelector->fontFaceCache()->add(fontSelector, fontFaceRules[i], fontFace);
- }
- if (fontFaceRules.size())
- invalidateMatchedPropertiesCache();
- }
-}
-
void StyleResolver::addToStyleSharingList(Element& element)
{
// Never add elements to the style sharing list if we're not in a recalcStyle,
@@ -730,6 +703,16 @@ void StyleResolver::applyPropertiesToStyle(const CSSPropertyValue* properties, s
}
}
+void StyleResolver::resetMediaQueryAffectedByViewportChange()
+{
+ m_viewportDependentMediaQueryResults.clear();
+}
+
+void StyleResolver::addMediaQueryAffectedByViewportChange(const MediaQueryResultList& list)
+{
+ m_viewportDependentMediaQueryResults.appendVector(list);
+}
+
bool StyleResolver::mediaQueryAffectedByViewportChange() const
{
for (unsigned i = 0; i < m_viewportDependentMediaQueryResults.size(); ++i) {
« no previous file with comments | « sky/engine/core/css/resolver/StyleResolver.h ('k') | sky/engine/core/dom/StyleEngine.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698