Remove SiblingRuleHelper

Source/core/css/SelectorChecker.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
  * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
  * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
  * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
  * Copyright (C) Research In Motion Limited 2011. All rights reserved.
@@ skipping 17 matching lines @@
 #include "config.h"
 #include "core/css/SelectorChecker.h"
 
 #include "HTMLNames.h"
 #include "core/css/CSSSelectorList.h"
 #include "core/css/SiblingTraversalStrategies.h"
 #include "core/dom/Document.h"
 #include "core/dom/ElementTraversal.h"
 #include "core/dom/FullscreenElementStack.h"
 #include "core/dom/NodeRenderStyle.h"
-#include "core/dom/SiblingRuleHelper.h"
 #include "core/dom/Text.h"
 #include "core/dom/shadow/InsertionPoint.h"
 #include "core/dom/shadow/ShadowRoot.h"
 #include "core/editing/FrameSelection.h"
 #include "core/frame/LocalFrame.h"
 #include "core/html/HTMLDocument.h"
 #include "core/html/HTMLFrameElementBase.h"
 #include "core/html/HTMLInputElement.h"
 #include "core/html/HTMLOptionElement.h"
 #include "core/html/parser/HTMLParserIdioms.h"
@@ skipping 224 matching lines @@
             nextContext.isSubSelector = false;
             nextContext.elementStyle = 0;
             return match(nextContext, siblingTraversalStrategy, result);
         }
 
     case CSSSelector::ShadowContent:
         return matchForShadowDistributed(context.element, siblingTraversalStrategy, nextContext, result);
 
     case CSSSelector::DirectAdjacent:
         if (m_mode == ResolvingStyle) {
-            if (Node* parent = context.element->parentElementOrShadowRoot())
-                SiblingRuleHelper(parent).setChildrenAffectedByDirectAdjacentRules();
+            if (ContainerNode* parent = context.element->parentElementOrShadowRoot())
+                parent->setChildrenAffectedByDirectAdjacentRules();
         }
         nextContext.element = ElementTraversal::previousSibling(*context.element);
         if (!nextContext.element)
             return SelectorFailsAllSiblings;
         nextContext.isSubSelector = false;
         nextContext.elementStyle = 0;
         return match(nextContext, siblingTraversalStrategy, result);
 
     case CSSSelector::IndirectAdjacent:
         if (m_mode == ResolvingStyle) {
-            if (Node* parent = context.element->parentElementOrShadowRoot())
-                SiblingRuleHelper(parent).setChildrenAffectedByIndirectAdjacentRules();
+            if (ContainerNode* parent = context.element->parentElementOrShadowRoot())
+                parent->setChildrenAffectedByIndirectAdjacentRules();
         }
         nextContext.element = ElementTraversal::previousSibling(*context.element);
         nextContext.isSubSelector = false;
         nextContext.elementStyle = 0;
         for (; nextContext.element; nextContext.element = ElementTraversal::previousSibling(*nextContext.element)) {
             Match match = this->match(nextContext, siblingTraversalStrategy, result);
             if (match == SelectorMatches || match == SelectorFailsAllSiblings || match == SelectorFailsCompletely)
                 return match;
         };
         return SelectorFailsAllSiblings;
@@ skipping 251 matching lines @@
                     element.setStyleAffectedByEmpty();
                     if (context.elementStyle)
                         context.elementStyle->setEmptyState(result);
                     else if (element.renderStyle() && (element.document().styleEngine()->usesSiblingRules() || element.renderStyle()->unique()))
                         element.renderStyle()->setEmptyState(result);
                 }
                 return result;
             }
         case CSSSelector::PseudoFirstChild:
             // first-child matches the first child that is an element
-            if (Node* parent = element.parentElementOrShadowRoot()) {
+            if (ContainerNode* parent = element.parentElementOrShadowRoot()) {
                 bool result = siblingTraversalStrategy.isFirstChild(element);
                 if (m_mode == ResolvingStyle) {
                     RenderStyle* childStyle = context.elementStyle ? context.elementStyle : element.renderStyle();
-                    SiblingRuleHelper(parent).setChildrenAffectedByFirstChildRules();
+                    parent->setChildrenAffectedByFirstChildRules();
                     if (result && childStyle)
                         childStyle->setFirstChildState();
                 }
                 return result;
             }
             break;
         case CSSSelector::PseudoFirstOfType:
             // first-of-type matches the first element of its type
-            if (Node* parent = element.parentElementOrShadowRoot()) {
+            if (ContainerNode* parent = element.parentElementOrShadowRoot()) {
                 bool result = siblingTraversalStrategy.isFirstOfType(element, element.tagQName());
                 if (m_mode == ResolvingStyle)
-                    SiblingRuleHelper(parent).setChildrenAffectedByForwardPositionalRules();
+                    parent->setChildrenAffectedByForwardPositionalRules();
                 return result;
             }
             break;
         case CSSSelector::PseudoLastChild:
             // last-child matches the last child that is an element
-            if (Node* parent = element.parentElementOrShadowRoot()) {
-                SiblingRuleHelper helper(parent);
-                bool result = helper.isFinishedParsingChildren() && siblingTraversalStrategy.isLastChild(element);
+            if (ContainerNode* parent = element.parentElementOrShadowRoot()) {
+                bool result = parent->isFinishedParsingChildren() && siblingTraversalStrategy.isLastChild(element);
                 if (m_mode == ResolvingStyle) {
                     RenderStyle* childStyle = context.elementStyle ? context.elementStyle : element.renderStyle();
-                    helper.setChildrenAffectedByLastChildRules();
+                    parent->setChildrenAffectedByLastChildRules();
                     if (result && childStyle)
                         childStyle->setLastChildState();
                 }
                 return result;
             }
             break;
         case CSSSelector::PseudoLastOfType:
             // last-of-type matches the last element of its type
-            if (Node* parent = element.parentElementOrShadowRoot()) {
-                SiblingRuleHelper helper(parent);
+            if (ContainerNode* parent = element.parentElementOrShadowRoot()) {
                 if (m_mode == ResolvingStyle)
-                    helper.setChildrenAffectedByBackwardPositionalRules();
-                if (!helper.isFinishedParsingChildren())
+                    parent->setChildrenAffectedByBackwardPositionalRules();
+                if (!parent->isFinishedParsingChildren())
                     return false;
                 return siblingTraversalStrategy.isLastOfType(element, element.tagQName());
             }
             break;
         case CSSSelector::PseudoOnlyChild:
-            if (Node* parent = element.parentElementOrShadowRoot()) {
-                SiblingRuleHelper helper(parent);
+            if (ContainerNode* parent = element.parentElementOrShadowRoot()) {
                 bool firstChild = siblingTraversalStrategy.isFirstChild(element);
-                bool onlyChild = firstChild && helper.isFinishedParsingChildren() && siblingTraversalStrategy.isLastChild(element);
+                bool onlyChild = firstChild && parent->isFinishedParsingChildren() && siblingTraversalStrategy.isLastChild(element);
                 if (m_mode == ResolvingStyle) {
                     RenderStyle* childStyle = context.elementStyle ? context.elementStyle : element.renderStyle();
-                    helper.setChildrenAffectedByFirstChildRules();
-                    helper.setChildrenAffectedByLastChildRules();
+                    parent->setChildrenAffectedByFirstChildRules();
+                    parent->setChildrenAffectedByLastChildRules();
                     if (firstChild && childStyle)
                         childStyle->setFirstChildState();
                     if (onlyChild && childStyle)
                         childStyle->setLastChildState();
                 }
                 return onlyChild;
             }
             break;
         case CSSSelector::PseudoOnlyOfType:
             // FIXME: This selector is very slow.
-            if (Node* parent = element.parentElementOrShadowRoot()) {
-                SiblingRuleHelper helper(parent);
+            if (ContainerNode* parent = element.parentElementOrShadowRoot()) {
                 if (m_mode == ResolvingStyle) {
-                    helper.setChildrenAffectedByForwardPositionalRules();
-                    helper.setChildrenAffectedByBackwardPositionalRules();
+                    parent->setChildrenAffectedByForwardPositionalRules();
+                    parent->setChildrenAffectedByBackwardPositionalRules();
                 }
-                if (!helper.isFinishedParsingChildren())
+                if (!parent->isFinishedParsingChildren())
                     return false;
                 return siblingTraversalStrategy.isFirstOfType(element, element.tagQName()) && siblingTraversalStrategy.isLastOfType(element, element.tagQName());
             }
             break;
         case CSSSelector::PseudoNthChild:
             if (!selector.parseNth())
                 break;
-            if (Node* parent = element.parentElementOrShadowRoot()) {
+            if (ContainerNode* parent = element.parentElementOrShadowRoot()) {
                 int count = 1 + siblingTraversalStrategy.countElementsBefore(element);
                 if (m_mode == ResolvingStyle) {
                     RenderStyle* childStyle = context.elementStyle ? context.elementStyle : element.renderStyle();
                     element.setChildIndex(count);
                     if (childStyle)
                         childStyle->setUnique();
-                    SiblingRuleHelper(parent).setChildrenAffectedByForwardPositionalRules();
+                    parent->setChildrenAffectedByForwardPositionalRules();
                 }
 
                 if (selector.matchNth(count))
                     return true;
             }
             break;
         case CSSSelector::PseudoNthOfType:
             if (!selector.parseNth())
                 break;
-            if (Node* parent = element.parentElementOrShadowRoot()) {
+            if (ContainerNode* parent = element.parentElementOrShadowRoot()) {
                 int count = 1 + siblingTraversalStrategy.countElementsOfTypeBefore(element, element.tagQName());
                 if (m_mode == ResolvingStyle)
-                    SiblingRuleHelper(parent).setChildrenAffectedByForwardPositionalRules();
+                    parent->setChildrenAffectedByForwardPositionalRules();
 
                 if (selector.matchNth(count))
                     return true;
             }
             break;
         case CSSSelector::PseudoNthLastChild:
             if (!selector.parseNth())
                 break;
-            if (Node* parent = element.parentElementOrShadowRoot()) {
-                SiblingRuleHelper helper(parent);
+            if (ContainerNode* parent = element.parentElementOrShadowRoot()) {
                 if (m_mode == ResolvingStyle)
-                    helper.setChildrenAffectedByBackwardPositionalRules();
-                if (!helper.isFinishedParsingChildren())
+                    parent->setChildrenAffectedByBackwardPositionalRules();
+                if (!parent->isFinishedParsingChildren())
                     return false;
                 int count = 1 + siblingTraversalStrategy.countElementsAfter(element);
                 if (selector.matchNth(count))
                     return true;
             }
             break;
         case CSSSelector::PseudoNthLastOfType:
             if (!selector.parseNth())
                 break;
-            if (Node* parent = element.parentElementOrShadowRoot()) {
-                SiblingRuleHelper helper(parent);
+            if (ContainerNode* parent = element.parentElementOrShadowRoot()) {
                 if (m_mode == ResolvingStyle)
-                    helper.setChildrenAffectedByBackwardPositionalRules();
-                if (!helper.isFinishedParsingChildren())
+                    parent->setChildrenAffectedByBackwardPositionalRules();
+                if (!parent->isFinishedParsingChildren())
                     return false;
 
                 int count = 1 + siblingTraversalStrategy.countElementsOfTypeAfter(element, element.tagQName());
                 if (selector.matchNth(count))
                     return true;
             }
             break;
         case CSSSelector::PseudoTarget:
             if (element == element.document().cssTarget())
                 return true;
@@ skipping 399 matching lines @@
     return element.focused() && isFrameFocused(element);
 }
 
 template
 SelectorChecker::Match SelectorChecker::match(const SelectorCheckingContext&, const DOMSiblingTraversalStrategy&, MatchResult*) const;
 
 template
 SelectorChecker::Match SelectorChecker::match(const SelectorCheckingContext&, const ShadowDOMSiblingTraversalStrategy&, MatchResult*) const;
 
 }