Call Element::rebuildLayoutTree from Document::updateStyle directly

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 165 matching lines @@
 Element* Element::create(const QualifiedName& tagName, Document* document) {
   return new Element(tagName, document, CreateElement);
 }
 
 Element::Element(const QualifiedName& tagName,
                  Document* document,
                  ConstructionType type)
     : ContainerNode(document, type), m_tagName(tagName) {}
 
 Element::~Element() {
-  DCHECK(needsAttach());

[nainar, 2016/11/29 06:13:39]

See comment in ContainerNode destructor. 

 }
 
 inline ElementRareData* Element::elementRareData() const {
   DCHECK(hasRareData());
   return static_cast<ElementRareData*>(rareData());
 }
 
 inline ElementRareData& Element::ensureElementRareData() {
   return static_cast<ElementRareData&>(ensureRareData());
 }
@@ skipping 1458 matching lines @@
 
   if (document().frame())
     document().frame()->eventHandler().elementRemoved(this);
 }
 
 void Element::attachLayoutTree(const AttachContext& context) {
   DCHECK(document().inStyleRecalc());
 
   // 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() && getStyleChangeType() == NeedsReattachStyleChange) {

[nainar, 2016/11/29 06:13:39]

We are setting the corresponging NeedsReattachLayoutTree - check that here
instead. 

+  if (hasRareData() && needsReattachLayoutTree()) {
     ElementRareData* data = elementRareData();
     data->clearComputedStyle();
   }
 
   if (!isActiveSlotOrActiveInsertionPoint())
     LayoutTreeBuilderForElement(*this, context.resolvedStyle)
         .createLayoutObjectIfNeeded();
 
   addCallbackSelectors();
 
@@ skipping 67 matching lines @@
     if (inActiveChain())
       document().activeChainNodeDetached(*this);
     document().userActionElements().didDetach(*this);
   }
 
   if (context.clearInvalidation)
     document().styleEngine().styleInvalidator().clearInvalidation(*this);
 
   setNeedsResizeObserverUpdate();
 
-  DCHECK(needsAttach());
+  DCHECK(needsReattachLayoutTree());
 }
 
 bool Element::pseudoStyleCacheIsInvalid(const ComputedStyle* currentStyle,
                                         ComputedStyle* newStyle) {
   DCHECK_EQ(currentStyle, computedStyle());
   DCHECK(layoutObject());
 
   if (!currentStyle)
     return false;
 
@@ skipping 85 matching lines @@
         data->clearComputedStyle();
 
       if (change >= IndependentInherit) {
         if (ElementAnimations* elementAnimations = data->elementAnimations())
           elementAnimations->setAnimationStyleChange(false);
       }
     }
     if (parentComputedStyle())
       change = recalcOwnStyle(change, nextTextSibling);
     clearNeedsStyleRecalc();
-    clearNeedsReattachLayoutTree();
   }
 
   // If we reattached we don't need to recalc the style of our descendants
   // anymore.
   if ((change >= UpdatePseudoElements && change < Reattach) ||
       childNeedsStyleRecalc()) {
     SelectorFilterParentScope filterScope(*this);
     StyleSharingDepthScope sharingScope(*this);
 
     updatePseudoElement(PseudoIdBefore, change);
 
     if (change > UpdatePseudoElements || childNeedsStyleRecalc()) {
       for (ShadowRoot* root = youngestShadowRoot(); root;
            root = root->olderShadowRoot()) {
         if (root->shouldCallRecalcStyle(change))
           root->recalcStyle(change);
       }
       recalcDescendantStyles(change);
     }
 
     updatePseudoElement(PseudoIdAfter, change);
     updatePseudoElement(PseudoIdBackdrop, change);
 
     // If our children have changed then we need to force the first-letter
     // checks as we don't know if they effected the first letter or not.
     // This can be seen when a child transitions from floating to
     // non-floating we have to take it into account for the first letter.
     updatePseudoElement(PseudoIdFirstLetter,
                         childNeedsStyleRecalc() ? Force : change);
-
-    clearChildNeedsStyleRecalc();
-    clearChildNeedsReattachLayoutTree();
   }
 
   if (hasCustomStyleCallbacks())
     didRecalcStyle(change);
 }
 
 PassRefPtr<ComputedStyle> Element::propagateInheritedProperties(
     StyleRecalcChange change) {
   if (change != IndependentInherit)
     return nullptr;
@@ skipping 39 matching lines @@
   } 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);
     setNeedsReattachLayoutTree();
-    return rebuildLayoutTree();
+    return Reattach;
   }
 
   DCHECK(oldStyle);
 
   if (localChange != NoChange)
     updateCallbackSelectors(oldStyle.get(), newStyle.get());
 
   if (LayoutObject* layoutObject = this->layoutObject()) {
     if (localChange != NoChange ||
         pseudoStyleCacheIsInvalid(oldStyle.get(), newStyle.get())) {
@@ skipping 20 matching lines @@
         return Inherit;
       newStyle->copyChildDependentFlagsFrom(*oldStyle);
     }
     if (oldStyle->hasPseudoElementStyle() || newStyle->hasPseudoElementStyle())
       return UpdatePseudoElements;
   }
 
   return localChange;
 }
 
-StyleRecalcChange Element::rebuildLayoutTree() {
+void Element::rebuildLayoutTree() {
   DCHECK(inActiveDocument());
+  DCHECK(!needsStyleRecalc());
+  DCHECK(!childNeedsStyleRecalc());
+  DCHECK(parentNode());
+  DCHECK(parentNode()->childNeedsReattachLayoutTree());
+
   StyleReattachData styleReattachData = document().getStyleReattachData(*this);
   AttachContext reattachContext;
   reattachContext.resolvedStyle = styleReattachData.computedStyle.get();
-  bool layoutObjectWillChange = needsAttach() || layoutObject();
+  bool layoutObjectWillChange = needsReattachLayoutTree() || layoutObject();
 
-  // We are calling Element::rebuildLayoutTree() from inside
-  // Element::recalcOwnStyle where we set the NeedsReattachLayoutTree
-  // flag - so needsReattachLayoutTree() should always be true.
-  DCHECK(parentNode());
-  DCHECK(parentNode()->childNeedsReattachLayoutTree());
-  DCHECK(needsReattachLayoutTree());
-  reattachLayoutTree(reattachContext);
-  // Since needsReattachLayoutTree() is always true we go into
-  // reattachLayoutTree() which reattaches all the descendant
-  // sub-trees. At this point no child should need reattaching.
+  if (needsReattachLayoutTree()) {
+    reattachLayoutTree(reattachContext);
+  } else if (childNeedsReattachLayoutTree()) {
+    SelectorFilterParentScope filterScope(*this);
+    StyleSharingDepthScope sharingScope(*this);
+    reattachPseudoElementLayoutTree(PseudoIdBefore);
+    rebuildShadowRootLayoutTree();
+    rebuildDescendantLayoutTree();
+    reattachPseudoElementLayoutTree(PseudoIdAfter);
+    reattachPseudoElementLayoutTree(PseudoIdBackdrop);
+    reattachPseudoElementLayoutTree(PseudoIdFirstLetter);
+  }
+  DCHECK(!needsReattachLayoutTree());
   DCHECK(!childNeedsReattachLayoutTree());
 
   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);
-    return Reattach;
   }
-  return ReattachNoLayoutObject;
+}
+
+void Element::rebuildShadowRootLayoutTree() {
+  DCHECK(!needsStyleRecalc());
+  DCHECK(!childNeedsStyleRecalc());
+  DCHECK(!needsReattachLayoutTree());
+  for (ShadowRoot* root = youngestShadowRoot(); root;
+       root = root->olderShadowRoot()) {
+    if (root->needsReattachLayoutTree() || root->childNeedsReattachLayoutTree())
+      root->rebuildLayoutTree();
+  }
+}
+
+void Element::reattachPseudoElementLayoutTree(PseudoId pseudoId) {
+  DCHECK(!needsStyleRecalc());
+  DCHECK(!childNeedsStyleRecalc());
+  DCHECK(!needsReattachLayoutTree());
+  if (PseudoElement* element = pseudoElement(pseudoId)) {
+    if (element->needsReattachLayoutTree() ||
+        element->childNeedsReattachLayoutTree())
+      element->rebuildLayoutTree();
+  }
 }
 
 void Element::updateCallbackSelectors(const ComputedStyle* oldStyle,
                                       const ComputedStyle* 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())
@@ skipping 1206 matching lines @@
   // avoid it here.
   PseudoElement* element =
       document().styleEngine().ensureResolver().createPseudoElementIfNeeded(
           *this, pseudoId);
   if (!element)
     return;
 
   if (pseudoId == PseudoIdBackdrop)
     document().addToTopLayer(element, this);
   element->insertedInto(this);
+  element->setLocalNeedsReattachLayoutTree();

[nainar, 2016/11/29 06:13:39]

Only the Pseudo Element needs to be reattached. 

   element->attachLayoutTree();
-
+  DCHECK(!element->needsReattachLayoutTree());
   InspectorInstrumentation::pseudoElementCreated(element);
 
   ensureElementRareData().setPseudoElement(pseudoId, element);
 }
 
 PseudoElement* Element::pseudoElement(PseudoId pseudoId) const {
   return hasRareData() ? elementRareData()->pseudoElement(pseudoId) : nullptr;
 }
 
 LayoutObject* Element::pseudoElementLayoutObject(PseudoId pseudoId) const {
@@ skipping 831 matching lines @@
 }
 
 DEFINE_TRACE_WRAPPERS(Element) {
   if (hasRareData()) {
     visitor->traceWrappers(elementRareData());
   }
   ContainerNode::traceWrappers(visitor);
 }
 
 }  // namespace blink