Remove SiblingRuleHelper

Source/core/dom/Element.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Peter Kelly (pmk@post.com)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  *           (C) 2007 David Smith (catfish.man@gmail.com)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013 Apple Inc. All rights reserved.
  *           (C) 2007 Eric Seidel (eric@webkit.org)
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 45 matching lines @@
 #include "core/dom/MutationObserverInterestGroup.h"
 #include "core/dom/MutationRecord.h"
 #include "core/dom/NamedNodeMap.h"
 #include "core/dom/NodeRenderStyle.h"
 #include "core/dom/PostAttachCallbacks.h"
 #include "core/dom/PresentationAttributeStyle.h"
 #include "core/dom/PseudoElement.h"
 #include "core/dom/RenderTreeBuilder.h"
 #include "core/dom/ScriptableDocumentParser.h"
 #include "core/dom/SelectorQuery.h"
-#include "core/dom/SiblingRuleHelper.h"
 #include "core/dom/Text.h"
 #include "core/dom/custom/CustomElement.h"
 #include "core/dom/custom/CustomElementRegistrationContext.h"
 #include "core/dom/shadow/InsertionPoint.h"
 #include "core/dom/shadow/ShadowRoot.h"
 #include "core/editing/FrameSelection.h"
 #include "core/editing/TextIterator.h"
 #include "core/editing/htmlediting.h"
 #include "core/editing/markup.h"
 #include "core/events/EventDispatcher.h"
@@ skipping 146 matching lines @@
     return static_cast<ElementRareData*>(rareData());
 }
 
 inline ElementRareData& Element::ensureElementRareData()
 {
     return static_cast<ElementRareData&>(ensureRareData());
 }
 
 bool Element::hasElementFlagInternal(ElementFlags mask) const
 {
-    ASSERT(hasRareData());
-    return elementRareData()->hasFlag(mask);
+    return elementRareData()->hasElementFlag(mask);
 }
 
 void Element::setElementFlag(ElementFlags mask, bool value)
 {
     if (!hasRareData() && !value)
         return;
-    ensureElementRareData().setFlag(mask, value);
+    ensureElementRareData().setElementFlag(mask, value);
 }
 
 void Element::clearElementFlag(ElementFlags mask)
 {
     if (!hasRareData())
         return;
-    elementRareData()->clearFlag(mask);
+    elementRareData()->clearElementFlag(mask);
 }
 
 void Element::clearTabIndexExplicitlyIfNeeded()
 {
     if (hasRareData())
         elementRareData()->clearTabIndexExplicitly();
 }
 
 void Element::setTabIndexExplicitly(short tabIndex)
 {
@@ skipping 1157 matching lines @@
 {
     ASSERT(document().inStyleRecalc());
 
     StyleResolverParentPusher parentPusher(*this);
 
     // We've already been through detach when doing an attach, but we might
     // need to clear any state that's been added since then.
     if (hasRareData() && styleChangeType() == NeedsReattachStyleChange) {
         ElementRareData* data = elementRareData();
         data->clearComputedStyle();
-        data->resetDynamicRestyleObservations();
+        data->clearRestyleFlags();
         // Only clear the style state if we're not going to reuse the style from recalcStyle.
         if (!context.resolvedStyle)
             data->resetStyleState();
     }
 
     RenderTreeBuilder(this, context.resolvedStyle).createRendererForElementIfNeeded();
 
     addCallbackSelectors();
 
     createPseudoElementIfNeeded(BEFORE);
 
     // When a shadow root exists, it does the work of attaching the children.
     if (ElementShadow* shadow = this->shadow()) {
         parentPusher.push();
         shadow->attach(context);
     } else if (firstChild()) {
         parentPusher.push();
     }
 
     ContainerNode::attach(context);
 
     createPseudoElementIfNeeded(AFTER);
     createPseudoElementIfNeeded(BACKDROP);
 
     if (hasRareData()) {
         ElementRareData* data = elementRareData();
-        if (data->hasFlag(NeedsFocusAppearanceUpdateSoonAfterAttach)) {
+        if (data->hasElementFlag(NeedsFocusAppearanceUpdateSoonAfterAttach)) {
             if (isFocusable() && document().focusedElement() == this)
                 document().updateFocusAppearanceSoon(false /* don't restore selection */);
-            data->clearFlag(NeedsFocusAppearanceUpdateSoonAfterAttach);
+            data->clearElementFlag(NeedsFocusAppearanceUpdateSoonAfterAttach);
         }
         if (!renderer()) {
             if (ActiveAnimations* activeAnimations = data->activeAnimations()) {
                 activeAnimations->cssAnimations().cancel();
                 activeAnimations->setAnimationStyleChange(false);
             }
         }
     }
 
     InspectorInstrumentation::didRecalculateStyleForElement(this);
 }
 
 void Element::detach(const AttachContext& context)
 {
     RenderWidget::UpdateSuspendScope suspendWidgetHierarchyUpdates;
     cancelFocusAppearanceUpdate();
     removeCallbackSelectors();
     if (hasRareData()) {
         ElementRareData* data = elementRareData();
         data->clearPseudoElements();
 
         // attach() will perform the below steps for us when inside recalcStyle.
         if (!document().inStyleRecalc()) {
             data->resetStyleState();
             data->clearComputedStyle();
-            data->resetDynamicRestyleObservations();
+            data->clearRestyleFlags();
         }
 
         if (ActiveAnimations* activeAnimations = data->activeAnimations()) {
             if (context.performingReattach) {
                 // FIXME: We call detach from withing style recalc, so compositingState is not up to date.
                 // https://code.google.com/p/chromium/issues/detail?id=339847
                 DisableCompositingQueryAsserts disabler;
 
                 // FIXME: restart compositor animations rather than pull back to the main thread
                 activeAnimations->cancelAnimationOnCompositor();
@@ skipping 181 matching lines @@
             if (root->shouldCallRecalcStyle(change)) {
                 parentPusher.push();
                 root->recalcStyle(change);
             }
         }
     }
 
     updatePseudoElement(BEFORE, change);
 
     if (change < Force && hasRareData() && childNeedsStyleRecalc())
-        SiblingRuleHelper(this).checkForChildrenAdjacentRuleChanges();
+        checkForChildrenAdjacentRuleChanges();
 
     if (change > UpdatePseudoElements || childNeedsStyleRecalc()) {
         // This loop is deliberately backwards because we use insertBefore in the rendering tree, and want to avoid
         // a potentially n^2 loop to find the insertion point while resolving style. Having us start from the last
         // child and work our way back means in the common case, we'll find the insertion point in O(1) time.
         // See crbug.com/288225
         StyleResolver& styleResolver = document().ensureStyleResolver();
         Text* lastTextNode = 0;
         for (Node* child = lastChild(); child; child = child->previousSibling()) {
             if (child->isTextNode()) {
@@ skipping 1726 matching lines @@
     // Before doing so, we need to resolve issues in HTMLSelectElement::recalcListItems
     // and RenderMenuList::setText. See also https://bugs.webkit.org/show_bug.cgi?id=88405
     if (isHTMLOptionElement(*this) || isHTMLOptGroupElement(*this))
         return false;
     if (FullscreenElementStack::isActiveFullScreenElement(this))
         return false;
     return true;
 }
 
 } // namespace WebCore