Title: [154297] trunk/Source/WebCore
- Revision
- 154297
- Author
- [email protected]
- Date
- 2013-08-19 14:09:46 -0700 (Mon, 19 Aug 2013)
Log Message
<https://webkit.org/b/119937> Remove ElementRuleCollector's m_behaviorAtBoundary
Reviewed by Darin Adler.
The value DoesNotCrossBoundary is the default behavior boundary of SelectorChecker,
and it is never changed by ElementRuleCollector.
* css/ElementRuleCollector.cpp:
(WebCore::ElementRuleCollector::collectMatchingRules):
(WebCore::ElementRuleCollector::ruleMatches):
* css/ElementRuleCollector.h:
(WebCore::ElementRuleCollector::ElementRuleCollector):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (154296 => 154297)
--- trunk/Source/WebCore/ChangeLog 2013-08-19 21:07:22 UTC (rev 154296)
+++ trunk/Source/WebCore/ChangeLog 2013-08-19 21:09:46 UTC (rev 154297)
@@ -1,5 +1,20 @@
2013-08-19 Benjamin Poulain <[email protected]>
+ <https://webkit.org/b/119937> Remove ElementRuleCollector's m_behaviorAtBoundary
+
+ Reviewed by Darin Adler.
+
+ The value DoesNotCrossBoundary is the default behavior boundary of SelectorChecker,
+ and it is never changed by ElementRuleCollector.
+
+ * css/ElementRuleCollector.cpp:
+ (WebCore::ElementRuleCollector::collectMatchingRules):
+ (WebCore::ElementRuleCollector::ruleMatches):
+ * css/ElementRuleCollector.h:
+ (WebCore::ElementRuleCollector::ElementRuleCollector):
+
+2013-08-19 Benjamin Poulain <[email protected]>
+
<https://webkit.org/b/119934> Remove a repeated "private:" from ElementRuleCollector
Reviewed by Darin Adler.
Modified: trunk/Source/WebCore/css/ElementRuleCollector.cpp (154296 => 154297)
--- trunk/Source/WebCore/css/ElementRuleCollector.cpp 2013-08-19 21:07:22 UTC (rev 154296)
+++ trunk/Source/WebCore/css/ElementRuleCollector.cpp 2013-08-19 21:09:46 UTC (rev 154297)
@@ -154,8 +154,7 @@
TreeScope* treeScope = element->treeScope();
if (!MatchingUARulesScope::isMatchingUARules()
&& !treeScope->applyAuthorStyles()
- && (!matchRequest.scope || matchRequest.scope->treeScope() != treeScope)
- && m_behaviorAtBoundary == SelectorChecker::DoesNotCrossBoundary)
+ && (!matchRequest.scope || matchRequest.scope->treeScope() != treeScope))
return;
// We need to collect the rules for id, class, tag, and everything else into a buffer and
@@ -374,7 +373,6 @@
context.pseudoId = m_pseudoStyleRequest.pseudoId;
context.scrollbar = m_pseudoStyleRequest.scrollbar;
context.scrollbarPart = m_pseudoStyleRequest.scrollbarPart;
- context.behaviorAtBoundary = m_behaviorAtBoundary;
SelectorChecker::Match match = selectorChecker.match(context, dynamicPseudo);
if (match != SelectorChecker::SelectorMatches)
return false;
Modified: trunk/Source/WebCore/css/ElementRuleCollector.h (154296 => 154297)
--- trunk/Source/WebCore/css/ElementRuleCollector.h 2013-08-19 21:07:22 UTC (rev 154296)
+++ trunk/Source/WebCore/css/ElementRuleCollector.h 2013-08-19 21:09:46 UTC (rev 154297)
@@ -51,7 +51,8 @@
, m_sameOriginOnly(false)
, m_mode(SelectorChecker::ResolvingStyle)
, m_canUseFastReject(m_selectorFilter.parentStackIsConsistent(state.parentNode()))
- , m_behaviorAtBoundary(SelectorChecker::DoesNotCrossBoundary) { }
+ {
+ }
void matchAllRules(bool matchAuthorAndUserStyles, bool includeSMILProperties);
void matchUARules();
@@ -103,7 +104,6 @@
bool m_sameOriginOnly;
SelectorChecker::Mode m_mode;
bool m_canUseFastReject;
- SelectorChecker::BehaviorAtBoundary m_behaviorAtBoundary;
OwnPtr<Vector<const RuleData*, 32> > m_matchedRules;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
