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

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

Issue 848493003: Don't scope check in SelectorChecker. (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') | sky/engine/core/dom/SelectorQuery.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 36ff897a31e7a45c297a1a06d0fb1043c1c672c2..8cfc226f4cbc9d71a2cfc11e81b6cc3fc5368ffd 100644
--- a/sky/engine/core/css/resolver/StyleResolver.cpp
+++ b/sky/engine/core/css/resolver/StyleResolver.cpp
@@ -232,10 +232,8 @@ void StyleResolver::matchAuthorRules(Element* element, ElementRuleCollector& col
// 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, cascadeOrder++);
+ shadowRoot->scopedStyleResolver().collectMatchingHostRules(collector, cascadeOrder++);
ScopedStyleResolver& resolver = element->treeScope().scopedStyleResolver();
resolver.collectMatchingAuthorRules(collector, cascadeOrder);
@@ -245,8 +243,6 @@ void StyleResolver::matchAuthorRules(Element* element, ElementRuleCollector& col
void StyleResolver::matchUARules(ElementRuleCollector& collector)
{
- collector.setMatchingUARules(true);
-
collector.clearMatchedRules();
collector.matchedResult().ranges.lastUARule = collector.matchedResult().matchedProperties.size() - 1;
@@ -254,8 +250,6 @@ void StyleResolver::matchUARules(ElementRuleCollector& collector)
collector.collectMatchingRules(MatchRequest(&defaultStyles()), ruleRange);
collector.sortAndTransferMatchedRules();
-
- collector.setMatchingUARules(false);
}
void StyleResolver::matchAllRules(StyleResolverState& state, ElementRuleCollector& collector)
« no previous file with comments | « sky/engine/core/css/resolver/ScopedStyleResolver.cpp ('k') | sky/engine/core/dom/SelectorQuery.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698