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 1d02cf51a8f803f3045df673fe1cb1b8534986fd..2605fa971bc5983e55d63c2369e4367991fe5e52 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());
@@ -1911,6 +1913,7 @@ void Document::updateStyle() {
   }
 
   clearNeedsStyleRecalc();
+  clearNeedsReattachLayoutTree();
 
   StyleResolver& resolver = ensureStyleResolver();
 
@@ -1933,6 +1936,7 @@ void Document::updateStyle() {
   // LayoutTreeConstruction.
   m_nonAttachedStyle.clear();
   clearChildNeedsStyleRecalc();
+  clearChildNeedsReattachLayoutTree();
 
   resolver.clearStyleSharingList();
 
@@ -1940,6 +1944,8 @@ void Document::updateStyle() {
 
   DCHECK(!needsStyleRecalc());
   DCHECK(!childNeedsStyleRecalc());
+  DCHECK(!needsReattachLayoutTree());
+  DCHECK(!childNeedsReattachLayoutTree());
   DCHECK(inStyleRecalc());
   DCHECK_EQ(styleResolver(), &resolver);
   DCHECK(m_nonAttachedStyle.isEmpty());