Call Element::rebuildLayoutTree from Document::updateStyle directly

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

Index: third_party/WebKit/Source/core/dom/ContainerNode.cpp
diff --git a/third_party/WebKit/Source/core/dom/ContainerNode.cpp b/third_party/WebKit/Source/core/dom/ContainerNode.cpp
index cfe0428c4d1150b125568ba6936061c3c3ebea3b..1be048eec8c55266823a50c08266ee08568ee250 100644
--- a/third_party/WebKit/Source/core/dom/ContainerNode.cpp
+++ b/third_party/WebKit/Source/core/dom/ContainerNode.cpp
@@ -788,6 +788,7 @@ void ContainerNode::detachLayoutTree(const AttachContext& context) {
     child->detachLayoutTree(childrenContext);
 
   setChildNeedsStyleRecalc();
+  setChildNeedsReattachLayoutTree();
   Node::detachLayoutTree(context);
 }
 
@@ -795,9 +796,15 @@ void ContainerNode::childrenChanged(const ChildrenChange& change) {
   document().incDOMTreeVersion();
   document().notifyChangeChildren(*this);
   invalidateNodeListCachesInAncestors();
-  if (change.isChildInsertion() && !childNeedsStyleRecalc()) {
-    setChildNeedsStyleRecalc();
-    markAncestorsWithChildNeedsStyleRecalc();
+  if (change.isChildInsertion()) {
+    if (!childNeedsStyleRecalc()) {
+      setChildNeedsStyleRecalc();
+      markAncestorsWithChildNeedsStyleRecalc();
+    }
+    if (!childNeedsReattachLayoutTree()) {
+      setChildNeedsReattachLayoutTree();
+      markAncestorsWithChildNeedsReattachLayoutTree();
+    }
   }
 }
 
@@ -1305,6 +1312,24 @@ void ContainerNode::recalcDescendantStyles(StyleRecalcChange change) {
   }
 }
 
+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,