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

Unified Diff: sky/engine/core/css/ElementRuleCollector.h

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 | « no previous file | sky/engine/core/css/ElementRuleCollector.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/css/ElementRuleCollector.h
diff --git a/sky/engine/core/css/ElementRuleCollector.h b/sky/engine/core/css/ElementRuleCollector.h
index a8b2d12aef71a18cc255d240f3e79a67995655dd..4da85d9b6b18fadc6f712e272879d9c96e76404d 100644
--- a/sky/engine/core/css/ElementRuleCollector.h
+++ b/sky/engine/core/css/ElementRuleCollector.h
@@ -92,11 +92,10 @@ public:
ElementRuleCollector(const ElementResolveContext&, RenderStyle* = 0);
~ElementRuleCollector();
- void setMatchingUARules(bool matchingUARules) { m_matchingUARules = matchingUARules; }
-
MatchResult& matchedResult();
void collectMatchingRules(const MatchRequest&, RuleRange&, CascadeOrder = ignoreCascadeOrder);
+ void collectMatchingHostRules(const MatchRequest&, RuleRange&, CascadeOrder cascadeOrder = ignoreCascadeOrder);
void sortAndTransferMatchedRules();
void clearMatchedRules();
void addElementStyleProperties(const StylePropertySet*, bool isCacheable = true);
@@ -114,7 +113,7 @@ private:
collectRuleIfMatches(*it, cascadeOrder, matchRequest, ruleRange);
}
- bool ruleMatches(const RuleData&, const ContainerNode* scope);
+ bool ruleMatches(const RuleData&);
void sortMatchedRules();
void addMatchedRule(const RuleData*, CascadeOrder, unsigned styleSheetIndex, const CSSStyleSheet* parentStyleSheet);
@@ -123,8 +122,6 @@ private:
const ElementResolveContext& m_context;
RefPtr<RenderStyle> m_style; // FIXME: This can be mutated during matching!
- bool m_matchingUARules;
-
OwnPtr<Vector<MatchedRule, 32> > m_matchedRules;
// Output.
« no previous file with comments | « no previous file | sky/engine/core/css/ElementRuleCollector.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698