Remove calls to styleForLayoutObject() in LayoutTreeBuilder::style()

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 1721 matching lines @@
     if (ElementAnimations* elementAnimations =
             elementRareData()->elementAnimations()) {
       elementAnimations->cssAnimations().cancel();
       elementAnimations->setAnimationStyleChange(false);
     }
   }
 
   SelectorFilterParentScope filterScope(*this);
   StyleSharingDepthScope sharingScope(*this);
 
+  clearNeedsReattachLayoutTree();
   createPseudoElementIfNeeded(PseudoIdBefore);
 
   // When a shadow root exists, it does the work of attaching the children.
   if (ElementShadow* shadow = this->shadow())
     shadow->attach(context);
 
   ContainerNode::attachLayoutTree(context);
 
   createPseudoElementIfNeeded(PseudoIdAfter);
   createPseudoElementIfNeeded(PseudoIdBackdrop);
@@ skipping 262 matching lines @@
 
   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) {
+    // This mimicks Element::recalcStyleForReattach except it also stores the
+    // nextTextSibling information.
     StyleReattachData styleReattachData;
     styleReattachData.computedStyle = std::move(newStyle);
     styleReattachData.nextTextSibling = nextTextSibling;
     document().addStyleReattachData(*this, styleReattachData);
     setNeedsReattachLayoutTree();
+    if (layoutObjectIsNeeded(*styleReattachData.computedStyle)) {
+      recalcContainedStyleForReattach();
+    }
     return Reattach;
   }
 
   DCHECK(oldStyle);
 
   if (localChange != NoChange)
     updateCallbackSelectors(oldStyle.get(), newStyle.get());
 
   if (LayoutObject* layoutObject = this->layoutObject()) {
     if (localChange != NoChange) {
@@ skipping 24 matching lines @@
         return Inherit;
       newStyle->copyChildDependentFlagsFrom(*oldStyle);
     }
     if (oldStyle->hasPseudoElementStyle() || newStyle->hasPseudoElementStyle())
       return UpdatePseudoElements;
   }
 
   return localChange;
 }
 
+void Element::recalcStyleForReattach() {
+  StyleReattachData styleReattachData;
+  styleReattachData.computedStyle = styleForLayoutObject();
+  document().addStyleReattachData(*this, styleReattachData);
+  setNeedsReattachLayoutTree();
+  if (layoutObjectIsNeeded(*styleReattachData.computedStyle.get())) {
+    recalcContainedStyleForReattach();
+  }
+}
+
+void Element::recalcContainedStyleForReattach() {
+  if (!childrenCanHaveStyle())
+    return;
+  if (hasCustomStyleCallbacks())
+    return;
+
+  SelectorFilterParentScope filterScope(*this);
+  StyleSharingDepthScope sharingScope(*this);
+  recalcShadowRootStylesForReattach();
+  recalcDescendantStylesForReattach();
+}
+
+void Element::recalcShadowRootStylesForReattach() {
+  for (ShadowRoot* root = youngestShadowRoot(); root;
+       root = root->olderShadowRoot()) {
+    root->recalcDescendantStylesForReattach();
+  }
+}
+
 void Element::rebuildLayoutTree() {
   DCHECK(inActiveDocument());
   DCHECK(parentNode());
 
   if (needsReattachLayoutTree()) {
     StyleReattachData styleReattachData =
         document().getStyleReattachData(*this);
     AttachContext reattachContext;
     reattachContext.resolvedStyle = styleReattachData.computedStyle.get();
     bool layoutObjectWillChange = needsAttach() || layoutObject();
@@ skipping 1150 matching lines @@
   RefPtr<ComputedStyle> result =
       document().ensureStyleResolver().pseudoStyleForElement(
           this, PseudoStyleRequest(pseudoElementSpecifier,
                                    PseudoStyleRequest::ForComputedStyle),
           elementStyle, elementStyle);
   DCHECK(result);
   return elementStyle->addCachedPseudoStyle(result.release());
 }
 
 const ComputedStyle* Element::nonLayoutObjectComputedStyle() const {
+  if (needsReattachLayoutTree())
+    return document().getStyleReattachData(*this).computedStyle.get();
+
   if (layoutObject() || !hasRareData())
     return nullptr;
 
   return elementRareData()->computedStyle();
 }
 
 bool Element::hasDisplayContentsStyle() const {
   if (const ComputedStyle* style = nonLayoutObjectComputedStyle())
     return style->display() == EDisplay::Contents;
   return false;
@@ skipping 974 matching lines @@
 }
 
 DEFINE_TRACE_WRAPPERS(Element) {
   if (hasRareData()) {
     visitor->traceWrappers(elementRareData());
   }
   ContainerNode::traceWrappers(visitor);
 }
 
 }  // namespace blink