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

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

Issue 800483006: Remove CascadeScope. (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/ScopedStyleResolver.cpp ('k') | no next file » | 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 34ec48025d65e7711373fc40e16e6e020872356b..36ff897a31e7a45c297a1a06d0fb1043c1c672c2 100644
--- a/sky/engine/core/css/resolver/StyleResolver.cpp
+++ b/sky/engine/core/css/resolver/StyleResolver.cpp
@@ -229,17 +229,16 @@ void StyleResolver::matchAuthorRules(Element* element, ElementRuleCollector& col
collector.clearMatchedRules();
collector.matchedResult().ranges.lastAuthorRule = collector.matchedResult().matchedProperties.size() - 1;
- // TODO(esprehn): Eliminate CascadeScope and CascadeOrder.
- CascadeScope cascadeScope = 0;
+ // TODO(esprehn): Eliminate CascadeOrder.
CascadeOrder cascadeOrder = 0;
// TODO(esprehn): This can only match :host rules, we should just store
// them in a separate RuleSet.
if (ShadowRoot* shadowRoot = element->shadowRoot())
- shadowRoot->scopedStyleResolver().collectMatchingAuthorRules(collector, cascadeScope, cascadeOrder++);
+ shadowRoot->scopedStyleResolver().collectMatchingAuthorRules(collector, cascadeOrder++);
ScopedStyleResolver& resolver = element->treeScope().scopedStyleResolver();
- resolver.collectMatchingAuthorRules(collector, cascadeScope, cascadeOrder);
+ resolver.collectMatchingAuthorRules(collector, cascadeOrder);
collector.sortAndTransferMatchedRules();
}
« no previous file with comments | « sky/engine/core/css/resolver/ScopedStyleResolver.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698