Move Layout Tree Construction code into Element::rebuildLayoutTree()

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

Index: third_party/WebKit/Source/core/dom/Document.cpp
diff --git a/third_party/WebKit/Source/core/dom/Document.cpp b/third_party/WebKit/Source/core/dom/Document.cpp
index 083ed51d91f4be61eec1603eeb3ac754d5ea3198..58ad8477e42112a140c1458b53eaf47fff7d2dcc 100644
--- a/third_party/WebKit/Source/core/dom/Document.cpp
+++ b/third_party/WebKit/Source/core/dom/Document.cpp
@@ -1779,6 +1779,8 @@ static void assertLayoutTreeUpdated(Node& root) {
       continue;
     DCHECK(!node.needsStyleRecalc());
     DCHECK(!node.childNeedsStyleRecalc());
+    DCHECK(!node.needsReattachLayoutTree());
+    DCHECK(!node.childNeedsReattachLayoutTree());
     DCHECK(!node.childNeedsDistributionRecalc());
     DCHECK(!node.needsStyleInvalidation());
     DCHECK(!node.childNeedsStyleInvalidation());
@@ -1912,6 +1914,7 @@ void Document::updateStyle() {
   }
 
   clearNeedsStyleRecalc();
+  clearNeedsReattachLayoutTree();
 
   StyleResolver& resolver = ensureStyleResolver();
 
@@ -1934,6 +1937,7 @@ void Document::updateStyle() {
   // LayoutTreeConstruction.
   m_nonAttachedStyle.clear();
   clearChildNeedsStyleRecalc();
+  clearChildNeedsReattachLayoutTree();
 
   resolver.clearStyleSharingList();
 
@@ -1941,6 +1945,8 @@ void Document::updateStyle() {
 
   DCHECK(!needsStyleRecalc());
   DCHECK(!childNeedsStyleRecalc());
+  DCHECK(!needsReattachLayoutTree());
+  DCHECK(!childNeedsReattachLayoutTree());
   DCHECK(inStyleRecalc());
   DCHECK_EQ(styleResolver(), &resolver);
   DCHECK(m_nonAttachedStyle.isEmpty());