Title: [140531] trunk/Source/WebCore
- Revision
- 140531
- Author
- [email protected]
- Date
- 2013-01-23 02:51:44 -0800 (Wed, 23 Jan 2013)
Log Message
[Refactoring] Remove elementParentStyle from SelectorCheckerContext
https://bugs.webkit.org/show_bug.cgi?id=107496
Reviewed by Darin Adler.
Since childrenAffectedBy bits were moved from RenderStyle to element,
now elementParentStyle is not used in SelectorChecker and
StyleResolver. We should remove the member varaiable from
SelectorCheckerContext.
No new tests, because just refactoring.
* css/SelectorChecker.cpp:
(WebCore::SelectorChecker::match):
* css/SelectorChecker.h:
(WebCore::SelectorChecker::SelectorCheckingContext::SelectorCheckingContext):
(SelectorCheckingContext):
* css/StyleResolver.cpp:
(WebCore::StyleResolver::ruleMatches):
Removed elementParentStyle.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (140530 => 140531)
--- trunk/Source/WebCore/ChangeLog 2013-01-23 10:26:04 UTC (rev 140530)
+++ trunk/Source/WebCore/ChangeLog 2013-01-23 10:51:44 UTC (rev 140531)
@@ -1,3 +1,26 @@
+2013-01-23 Takashi Sakamoto <[email protected]>
+
+ [Refactoring] Remove elementParentStyle from SelectorCheckerContext
+ https://bugs.webkit.org/show_bug.cgi?id=107496
+
+ Reviewed by Darin Adler.
+
+ Since childrenAffectedBy bits were moved from RenderStyle to element,
+ now elementParentStyle is not used in SelectorChecker and
+ StyleResolver. We should remove the member varaiable from
+ SelectorCheckerContext.
+
+ No new tests, because just refactoring.
+
+ * css/SelectorChecker.cpp:
+ (WebCore::SelectorChecker::match):
+ * css/SelectorChecker.h:
+ (WebCore::SelectorChecker::SelectorCheckingContext::SelectorCheckingContext):
+ (SelectorCheckingContext):
+ * css/StyleResolver.cpp:
+ (WebCore::StyleResolver::ruleMatches):
+ Removed elementParentStyle.
+
2013-01-23 Andreas Kling <[email protected]>
Pass CSSSelector pointers around as const after parsing stage.
Modified: trunk/Source/WebCore/css/SelectorChecker.cpp (140530 => 140531)
--- trunk/Source/WebCore/css/SelectorChecker.cpp 2013-01-23 10:26:04 UTC (rev 140530)
+++ trunk/Source/WebCore/css/SelectorChecker.cpp 2013-01-23 10:51:44 UTC (rev 140531)
@@ -309,7 +309,6 @@
nextContext.element = context.element->parentElement();
nextContext.isSubSelector = false;
nextContext.elementStyle = 0;
- nextContext.elementParentStyle = 0;
for (; nextContext.element; nextContext.element = nextContext.element->parentElement()) {
Match match = this->match(nextContext, ignoreDynamicPseudo, siblingTraversalStrategy);
if (match == SelectorMatches || match == SelectorFailsCompletely)
@@ -325,7 +324,6 @@
return SelectorFailsCompletely;
nextContext.isSubSelector = false;
nextContext.elementStyle = 0;
- nextContext.elementParentStyle = 0;
return match(nextContext, ignoreDynamicPseudo, siblingTraversalStrategy);
case CSSSelector::DirectAdjacent:
@@ -338,7 +336,6 @@
return SelectorFailsAllSiblings;
nextContext.isSubSelector = false;
nextContext.elementStyle = 0;
- nextContext.elementParentStyle = 0;
return match(nextContext, ignoreDynamicPseudo, siblingTraversalStrategy);
case CSSSelector::IndirectAdjacent:
@@ -349,7 +346,6 @@
nextContext.element = context.element->previousElementSibling();
nextContext.isSubSelector = false;
nextContext.elementStyle = 0;
- nextContext.elementParentStyle = 0;
for (; nextContext.element; nextContext.element = nextContext.element->previousElementSibling()) {
Match match = this->match(nextContext, ignoreDynamicPseudo, siblingTraversalStrategy);
if (match == SelectorMatches || match == SelectorFailsAllSiblings || match == SelectorFailsCompletely)
@@ -381,7 +377,6 @@
nextContext.element = shadowHostNode;
nextContext.isSubSelector = false;
nextContext.elementStyle = 0;
- nextContext.elementParentStyle = 0;
return match(nextContext, ignoreDynamicPseudo, siblingTraversalStrategy);
}
}
Modified: trunk/Source/WebCore/css/SelectorChecker.h (140530 => 140531)
--- trunk/Source/WebCore/css/SelectorChecker.h 2013-01-23 10:26:04 UTC (rev 140530)
+++ trunk/Source/WebCore/css/SelectorChecker.h 2013-01-23 10:51:44 UTC (rev 140531)
@@ -59,7 +59,6 @@
, visitedMatchType(visitedMatchType)
, pseudoStyle(NOPSEUDO)
, elementStyle(0)
- , elementParentStyle(0)
, isSubSelector(false)
, hasScrollbarPseudo(false)
, hasSelectionPseudo(false)
@@ -71,7 +70,6 @@
VisitedMatchType visitedMatchType;
PseudoId pseudoStyle;
RenderStyle* elementStyle;
- RenderStyle* elementParentStyle;
bool isSubSelector;
bool hasScrollbarPseudo;
bool hasSelectionPseudo;
Modified: trunk/Source/WebCore/css/StyleResolver.cpp (140530 => 140531)
--- trunk/Source/WebCore/css/StyleResolver.cpp 2013-01-23 10:26:04 UTC (rev 140530)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2013-01-23 10:51:44 UTC (rev 140531)
@@ -2283,7 +2283,6 @@
// Slow path.
SelectorChecker::SelectorCheckingContext context(ruleData.selector(), m_element, SelectorChecker::VisitedMatchEnabled);
context.elementStyle = style();
- context.elementParentStyle = m_parentNode ? m_parentNode->renderStyle() : 0;
context.scope = scope;
context.pseudoStyle = m_pseudoStyle;
SelectorChecker::Match match = m_selectorChecker.match(context, m_dynamicPseudo, DOMSiblingTraversalStrategy());
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
