Make RecursionData a stack-allocated variable in StyleInvalidator, since it is only

Source/core/css/invalidation/StyleInvalidator.cpp

 
 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 
 #include "core/css/invalidation/StyleInvalidator.h"
 
 #include "core/css/invalidation/DescendantInvalidationSet.h"
 #include "core/dom/Document.h"
 #include "core/dom/Element.h"
 #include "core/dom/ElementTraversal.h"
 #include "core/dom/shadow/ElementShadow.h"
 #include "core/dom/shadow/ShadowRoot.h"
 #include "core/rendering/RenderObject.h"
 
 namespace blink {
 
 void StyleInvalidator::invalidate(Document& document)
 {
+    RecursionData recursionData;
     if (Element* documentElement = document.documentElement())
-        invalidate(*documentElement);
+        invalidate(*documentElement, recursionData);
     document.clearChildNeedsStyleInvalidation();
     document.clearNeedsStyleInvalidation();
     clearPendingInvalidations();
 }
 
 void StyleInvalidator::scheduleInvalidation(PassRefPtrWillBeRawPtr<DescendantInvalidationSet> invalidationSet, Element& element)
 {
     ASSERT(element.inActiveDocument());
     ASSERT(element.styleChangeType() < SubtreeStyleChange);
     InvalidationList& list = ensurePendingInvalidationList(element);
@@ skipping 55 matching lines @@
         return true;
 
     for (InvalidationSets::iterator it = m_invalidationSets.begin(); it != m_invalidationSets.end(); ++it) {
         if ((*it)->invalidatesElement(element))
             return true;
     }
 
     return false;
 }
 
-bool StyleInvalidator::checkInvalidationSetsAgainstElement(Element& element)
+bool StyleInvalidator::checkInvalidationSetsAgainstElement(Element& element, StyleInvalidator::RecursionData& recursionData)
 {
-    if (element.styleChangeType() >= SubtreeStyleChange || m_recursionData.wholeSubtreeInvalid()) {
-        m_recursionData.setWholeSubtreeInvalid();
+    if (element.styleChangeType() >= SubtreeStyleChange || recursionData.wholeSubtreeInvalid()) {
+        recursionData.setWholeSubtreeInvalid();
         return false;
     }
     if (element.needsStyleInvalidation()) {
         if (InvalidationList* invalidationList = m_pendingInvalidationMap.get(&element)) {
             for (InvalidationList::const_iterator it = invalidationList->begin(); it != invalidationList->end(); ++it)
-                m_recursionData.pushInvalidationSet(**it);
+                recursionData.pushInvalidationSet(**it);
             // FIXME: It's really only necessary to clone the render style for this element, not full style recalc.
             return true;
         }
     }
-    return m_recursionData.matchesCurrentInvalidationSets(element);
+    return recursionData.matchesCurrentInvalidationSets(element);
 }
 
-bool StyleInvalidator::invalidateChildren(Element& element)
+bool StyleInvalidator::invalidateChildren(Element& element, StyleInvalidator::RecursionData& recursionData)
 {
     bool someChildrenNeedStyleRecalc = false;
     for (ShadowRoot* root = element.youngestShadowRoot(); root; root = root->olderShadowRoot()) {
-        if (!m_recursionData.treeBoundaryCrossing() && !root->childNeedsStyleInvalidation() && !root->needsStyleInvalidation())
+        if (!recursionData.treeBoundaryCrossing() && !root->childNeedsStyleInvalidation() && !root->needsStyleInvalidation())
             continue;
         for (Element* child = ElementTraversal::firstChild(*root); child; child = ElementTraversal::nextSibling(*child)) {
-            bool childRecalced = invalidate(*child);
+            bool childRecalced = invalidate(*child, recursionData);
             someChildrenNeedStyleRecalc = someChildrenNeedStyleRecalc || childRecalced;
         }
         root->clearChildNeedsStyleInvalidation();
         root->clearNeedsStyleInvalidation();
     }
     for (Element* child = ElementTraversal::firstChild(element); child; child = ElementTraversal::nextSibling(*child)) {
-        bool childRecalced = invalidate(*child);
+        bool childRecalced = invalidate(*child, recursionData);
         someChildrenNeedStyleRecalc = someChildrenNeedStyleRecalc || childRecalced;
     }
     return someChildrenNeedStyleRecalc;
 }
 
-bool StyleInvalidator::invalidate(Element& element)
+bool StyleInvalidator::invalidate(Element& element, StyleInvalidator::RecursionData& recursionData)
 {
-    RecursionCheckpoint checkpoint(&m_recursionData);
+    RecursionCheckpoint checkpoint(&recursionData);
 
-    bool thisElementNeedsStyleRecalc = checkInvalidationSetsAgainstElement(element);
+    bool thisElementNeedsStyleRecalc = checkInvalidationSetsAgainstElement(element, recursionData);
 
     bool someChildrenNeedStyleRecalc = false;
-    if (m_recursionData.hasInvalidationSets() || element.childNeedsStyleInvalidation())
-        someChildrenNeedStyleRecalc = invalidateChildren(element);
+    if (recursionData.hasInvalidationSets() || element.childNeedsStyleInvalidation())
+        someChildrenNeedStyleRecalc = invalidateChildren(element, recursionData);
 
     if (thisElementNeedsStyleRecalc) {
-        element.setNeedsStyleRecalc(m_recursionData.wholeSubtreeInvalid() ? SubtreeStyleChange : LocalStyleChange);
-    } else if (m_recursionData.hasInvalidationSets() && someChildrenNeedStyleRecalc) {
+        element.setNeedsStyleRecalc(recursionData.wholeSubtreeInvalid() ? SubtreeStyleChange : LocalStyleChange);
+    } else if (recursionData.hasInvalidationSets() && someChildrenNeedStyleRecalc) {
         // Clone the RenderStyle in order to preserve correct style sharing, if possible. Otherwise recalc style.
         if (RenderObject* renderer = element.renderer())
             renderer->setStyleInternal(RenderStyle::clone(renderer->style()));
         else
             element.setNeedsStyleRecalc(LocalStyleChange);
     }
 
     element.clearChildNeedsStyleInvalidation();
     element.clearNeedsStyleInvalidation();
 
     return thisElementNeedsStyleRecalc;
 }
 
 void StyleInvalidator::trace(Visitor* visitor)
 {
 #if ENABLE(OILPAN)
     visitor->trace(m_pendingInvalidationMap);
 #endif
 }
 
 } // namespace blink