Share recalcChildStyle between Element and ShadowRoot.

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 1474 matching lines @@
                     activeAnimations->setAnimationStyleChange(false);
             }
         }
         if (parentRenderStyle())
             change = recalcOwnStyle(change);
         clearNeedsStyleRecalc();
     }
 
     // If we reattached we don't need to recalc the style of our descendants anymore.
     if ((change >= UpdatePseudoElements && change < Reattach) || childNeedsStyleRecalc()) {
-        recalcChildStyle(change);
+        StyleResolverParentScope parentScope(*this);
+
+        updatePseudoElement(BEFORE, change);
+
+        if (change > UpdatePseudoElements || childNeedsStyleRecalc()) {
+            for (ShadowRoot* root = youngestShadowRoot(); root; root = root->olderShadowRoot()) {
+                if (root->shouldCallRecalcStyle(change))
+                    root->recalcStyle(change);
+            }
+            recalcChildStyle(change);
+        }
+
+        updatePseudoElement(AFTER, change);
+        updatePseudoElement(BACKDROP, change);
+
         clearChildNeedsStyleRecalc();
     }
 
     if (hasCustomStyleCallbacks())
         didRecalcStyle(change);
 
     if (change == Reattach)
         reattachWhitespaceSiblings(nextTextSibling);
 }
 
@@ skipping 42 matching lines @@
 
     if (change > Inherit || localChange > Inherit)
         return max(localChange, change);
 
     if (localChange < Inherit && (oldStyle->hasPseudoElementStyle() || newStyle->hasPseudoElementStyle()))
         return UpdatePseudoElements;
 
     return localChange;
 }
 
-void Element::recalcChildStyle(StyleRecalcChange change)
-{
-    ASSERT(document().inStyleRecalc());
-    ASSERT(change >= UpdatePseudoElements || childNeedsStyleRecalc());
-    ASSERT(!needsStyleRecalc());
-
-    StyleResolverParentScope parentScope(*this);
-
-    updatePseudoElement(BEFORE, change);
-
-    if (change > UpdatePseudoElements || childNeedsStyleRecalc()) {
-        for (ShadowRoot* root = youngestShadowRoot(); root; root = root->olderShadowRoot()) {
-            if (root->shouldCallRecalcStyle(change))
-                root->recalcStyle(change);
-        }
-    }
-
-    if (change < Force && hasRareData() && childNeedsStyleRecalc())
-        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()) {
-                toText(child)->recalcTextStyle(change, lastTextNode);
-                lastTextNode = toText(child);
-            } else if (child->isElementNode()) {
-                Element* element = toElement(child);
-                if (element->shouldCallRecalcStyle(change))
-                    element->recalcStyle(change, lastTextNode);
-                else if (element->supportsStyleSharing())
-                    styleResolver.addToStyleSharingList(*element);
-                if (element->renderer())
-                    lastTextNode = 0;
-            }
-        }
-    }
-
-    updatePseudoElement(AFTER, change);
-    updatePseudoElement(BACKDROP, change);
-}
-
 void Element::updateCallbackSelectors(RenderStyle* oldStyle, RenderStyle* newStyle)
 {
     Vector<String> emptyVector;
     const Vector<String>& oldCallbackSelectors = oldStyle ? oldStyle->callbackSelectors() : emptyVector;
     const Vector<String>& newCallbackSelectors = newStyle ? newStyle->callbackSelectors() : emptyVector;
     if (oldCallbackSelectors.isEmpty() && newCallbackSelectors.isEmpty())
         return;
     if (oldCallbackSelectors != newCallbackSelectors)
         CSSSelectorWatch::from(document()).updateSelectorMatches(oldCallbackSelectors, newCallbackSelectors);
 }
@@ skipping 1647 matching lines @@
 {
 #if ENABLE(OILPAN)
     if (hasRareData())
         visitor->trace(elementRareData());
     visitor->trace(m_elementData);
 #endif
     ContainerNode::trace(visitor);
 }
 
 } // namespace blink