Revert of Call Element::rebuildLayoutTree from Document::updateStyle directly

third_party/WebKit/Source/core/dom/ContainerNode.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2013 Apple Inc. All rights
  * reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
@@ skipping 770 matching lines @@
 
 void ContainerNode::detachLayoutTree(const AttachContext& context) {
   AttachContext childrenContext(context);
   childrenContext.resolvedStyle = nullptr;
   childrenContext.clearInvalidation = true;
 
   for (Node* child = firstChild(); child; child = child->nextSibling())
     child->detachLayoutTree(childrenContext);
 
   setChildNeedsStyleRecalc();
-  setChildNeedsReattachLayoutTree();
   Node::detachLayoutTree(context);
 }
 
 void ContainerNode::childrenChanged(const ChildrenChange& change) {
   document().incDOMTreeVersion();
   document().notifyChangeChildren(*this);
   invalidateNodeListCachesInAncestors();
-  if (change.isChildInsertion()) {
-    if (!childNeedsStyleRecalc()) {
-      setChildNeedsStyleRecalc();
-      markAncestorsWithChildNeedsStyleRecalc();
-    }
-    if (!childNeedsReattachLayoutTree()) {
-      setChildNeedsReattachLayoutTree();
-      markAncestorsWithChildNeedsReattachLayoutTree();
-    }
+  if (change.isChildInsertion() && !childNeedsStyleRecalc()) {
+    setChildNeedsStyleRecalc();
+    markAncestorsWithChildNeedsStyleRecalc();
   }
 }
 
 void ContainerNode::cloneChildNodes(ContainerNode* clone) {
   DummyExceptionStateForTesting exceptionState;
   for (Node* n = firstChild(); n && !exceptionState.hadException();
        n = n->nextSibling())
     clone->appendChild(n->cloneNode(true), exceptionState);
 }
 
@@ skipping 487 matching lines @@
       if (element->shouldCallRecalcStyle(change))
         element->recalcStyle(change, lastTextNode);
       else if (element->supportsStyleSharing())
         styleResolver.addToStyleSharingList(*element);
       if (element->layoutObject())
         lastTextNode = nullptr;
     }
   }
 }
 
-void ContainerNode::rebuildChildrenLayoutTrees() {
-  DCHECK(!needsReattachLayoutTree());
-
-  for (Node* child = lastChild(); child; child = child->previousSibling()) {
-    if (child->needsReattachLayoutTree() ||
-        child->childNeedsReattachLayoutTree()) {
-      if (child->isTextNode())
-        toText(child)->rebuildTextLayoutTree();
-      else if (child->isElementNode())
-        toElement(child)->rebuildLayoutTree();
-    }
-  }
-  // This is done in ContainerNode::attachLayoutTree but will never be cleared
-  // if we don't enter ContainerNode::attachLayoutTree so we do it here.
-  clearChildNeedsStyleRecalc();
-  clearChildNeedsReattachLayoutTree();
-}
-
 void ContainerNode::checkForSiblingStyleChanges(SiblingCheckType changeType,
                                                 Element* changedElement,
                                                 Node* nodeBeforeChange,
                                                 Node* nodeAfterChange) {
   if (!inActiveDocument() || document().hasPendingForcedStyleRecalc() ||
       getStyleChangeType() >= SubtreeStyleChange)
     return;
 
   if (!hasRestyleFlag(ChildrenAffectedByStructuralRules))
     return;
@@ skipping 159 matching lines @@
     return true;
 
   if (node->isElementNode() && toElement(node)->shadow())
     return true;
 
   return false;
 }
 #endif
 
 }  // namespace blink