Track lastTextNode during rebuildLayoutTree.

third_party/WebKit/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)
  *
@@ skipping 1830 matching lines @@
                                  isInTopLayer());
 
   return style.release();
 }
 
 PassRefPtr<ComputedStyle> Element::originalStyleForLayoutObject() {
   DCHECK(document().inStyleRecalc());
   return document().ensureStyleResolver().styleForElement(this);
 }
 
-void Element::recalcStyle(StyleRecalcChange change, Text* nextTextSibling) {
+void Element::recalcStyle(StyleRecalcChange change) {
   DCHECK(document().inStyleRecalc());
   DCHECK(!document().lifecycle().inDetach());
   DCHECK(!parentOrShadowHostNode()->needsStyleRecalc());
   DCHECK(inActiveDocument());
 
   if (hasCustomStyleCallbacks())
     willRecalcStyle(change);
 
   if (change >= IndependentInherit || needsStyleRecalc()) {
     if (hasRareData()) {
@@ skipping 20 matching lines @@
           data->clearComputedStyle();
         }
       }
 
       if (change >= IndependentInherit) {
         if (ElementAnimations* elementAnimations = data->elementAnimations())
           elementAnimations->setAnimationStyleChange(false);
       }
     }
     if (parentComputedStyle())
-      change = recalcOwnStyle(change, nextTextSibling);
+      change = recalcOwnStyle(change);
     // Needed because the rebuildLayoutTree code needs to see what the
     // styleChangeType() was on reattach roots. See Node::reattachLayoutTree()
     // for an example.
     if (change != Reattach)
       clearNeedsStyleRecalc();
   }
 
   // If we are going to reattach we don't need to recalc the style of
   // our descendants anymore.
   if (change < Reattach &&
@@ skipping 44 matching lines @@
   const ComputedStyle* style = computedStyle();
   if (!style || style->animations() || style->transitions())
     return nullptr;
   RefPtr<ComputedStyle> newStyle = ComputedStyle::clone(*style);
   newStyle->propagateIndependentInheritedProperties(*parentStyle);
   INCREMENT_STYLE_STATS_COUNTER(document().styleEngine(),
                                 independentInheritedStylesPropagated, 1);
   return newStyle;
 }
 
-StyleRecalcChange Element::recalcOwnStyle(StyleRecalcChange change,
-                                          Text* nextTextSibling) {
+StyleRecalcChange Element::recalcOwnStyle(StyleRecalcChange change) {
   DCHECK(document().inStyleRecalc());
   DCHECK(!parentOrShadowHostNode()->needsStyleRecalc());
   DCHECK(change >= IndependentInherit || needsStyleRecalc());
   DCHECK(parentComputedStyle());
 
   RefPtr<ComputedStyle> oldStyle = mutableComputedStyle();
 
   // When propagating inherited changes, we don't need to do a full style recalc
   // if the only changed properties are independent. In this case, we can simply
   // set these directly on the ComputedStyle object.
   RefPtr<ComputedStyle> newStyle = propagateInheritedProperties(change);
   if (!newStyle)
     newStyle = styleForLayoutObject();
   DCHECK(newStyle);
 
   StyleRecalcChange localChange =
       ComputedStyle::stylePropagationDiff(oldStyle.get(), newStyle.get());
   if (localChange == NoChange) {
     INCREMENT_STYLE_STATS_COUNTER(document().styleEngine(), stylesUnchanged, 1);
   } else {
     INCREMENT_STYLE_STATS_COUNTER(document().styleEngine(), stylesChanged, 1);
   }
 
   if (localChange == Reattach) {
-    StyleReattachData styleReattachData;
-    styleReattachData.computedStyle = std::move(newStyle);
-    styleReattachData.nextTextSibling = nextTextSibling;
-    document().addStyleReattachData(*this, styleReattachData);
+    document().addNonAttachedStyle(*this, std::move(newStyle));
     setNeedsReattachLayoutTree();
     return Reattach;
   }
 
   DCHECK(oldStyle);
 
   if (localChange != NoChange)
     updateCallbackSelectors(oldStyle.get(), newStyle.get());
 
   if (LayoutObject* layoutObject = this->layoutObject()) {
@@ skipping 24 matching lines @@
         return Inherit;
       newStyle->copyChildDependentFlagsFrom(*oldStyle);
     }
     if (oldStyle->hasPseudoElementStyle() || newStyle->hasPseudoElementStyle())
       return UpdatePseudoElements;
   }
 
   return localChange;
 }
 
-void Element::rebuildLayoutTree() {
+void Element::rebuildLayoutTree(Text* nextTextSibling) {
   DCHECK(inActiveDocument());
   DCHECK(parentNode());
 
   if (needsReattachLayoutTree()) {
-    StyleReattachData styleReattachData =
-        document().getStyleReattachData(*this);
     AttachContext reattachContext;
-    reattachContext.resolvedStyle = styleReattachData.computedStyle.get();
+    reattachContext.resolvedStyle = document().getNonAttachedStyle(*this);
     bool layoutObjectWillChange = needsAttach() || layoutObject();
     reattachLayoutTree(reattachContext);
-    if (layoutObjectWillChange || layoutObject()) {
-      // nextTextSibling is passed on to recalcStyle from recalcDescendantStyles
-      // we can either traverse the current subtree from this node onwards
-      // or store it.
-      // The choice is between increased time and increased memory complexity.
-      reattachWhitespaceSiblingsIfNeeded(styleReattachData.nextTextSibling);
-    }
+    if (layoutObjectWillChange || layoutObject())
+      reattachWhitespaceSiblingsIfNeeded(nextTextSibling);
   } else if (childNeedsReattachLayoutTree()) {
     DCHECK(!needsReattachLayoutTree());
     SelectorFilterParentScope filterScope(*this);
     StyleSharingDepthScope sharingScope(*this);
     reattachPseudoElementLayoutTree(PseudoIdBefore);
     rebuildShadowRootLayoutTree();
     rebuildChildrenLayoutTrees();
     reattachPseudoElementLayoutTree(PseudoIdAfter);
     reattachPseudoElementLayoutTree(PseudoIdBackdrop);
     reattachPseudoElementLayoutTree(PseudoIdFirstLetter);
@@ skipping 2126 matching lines @@
 }
 
 DEFINE_TRACE_WRAPPERS(Element) {
   if (hasRareData()) {
     visitor->traceWrappers(elementRareData());
   }
   ContainerNode::traceWrappers(visitor);
 }
 
 }  // namespace blink