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

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

Issue 852643002: Always set affected by bits in ElementRuleCollector. (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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/css/ElementRuleCollector.cpp
diff --git a/sky/engine/core/css/ElementRuleCollector.cpp b/sky/engine/core/css/ElementRuleCollector.cpp
index 9df4ab7c35eed9da92cbf6bd57092a47d33bd87e..3a8267e90fcb85507f087812326a6a0f145e7b14 100644
--- a/sky/engine/core/css/ElementRuleCollector.cpp
+++ b/sky/engine/core/css/ElementRuleCollector.cpp
@@ -124,18 +124,21 @@ void ElementRuleCollector::sortAndTransferMatchedRules()
inline bool ElementRuleCollector::ruleMatches(const RuleData& ruleData)
{
SelectorChecker checker(*m_context.element());
- if (checker.match(ruleData.selector())) {
- if (checker.matchedAttributeSelector())
- m_style->setUnique();
- if (checker.matchedFocusSelector())
- m_style->setAffectedByFocus();
- if (checker.matchedHoverSelector())
- m_style->setAffectedByHover();
- if (checker.matchedActiveSelector())
- m_style->setAffectedByActive();
- return true;
- }
- return false;
+ bool matched = checker.match(ruleData.selector());
+
+ if (checker.matchedAttributeSelector())
+ m_style->setUnique();
+
+ if (checker.matchedFocusSelector())
+ m_style->setAffectedByFocus();
+
+ if (checker.matchedHoverSelector())
+ m_style->setAffectedByHover();
+
+ if (checker.matchedActiveSelector())
+ m_style->setAffectedByActive();
+
+ return matched;
}
void ElementRuleCollector::collectRuleIfMatches(const RuleData& ruleData, CascadeOrder cascadeOrder, const MatchRequest& matchRequest, RuleRange& ruleRange)
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698