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

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

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  *           (C) 2006 Alexey Proskuryakov (ap@webkit.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All
  * rights reserved.
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
  * (http://www.torchmobile.com/)
  * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved.
@@ skipping 1761 matching lines @@
   for (Node& node : NodeTraversal::inclusiveDescendantsOf(root)) {
     // We leave some nodes with dirty bits in the tree because they don't
     // matter like Comment and ProcessingInstruction nodes.
     // TODO(esprehn): Don't even mark those nodes as needing recalcs in the
     // first place.
     if (!node.isElementNode() && !node.isTextNode() && !node.isShadowRoot() &&
         !node.isDocumentNode())
       continue;
     DCHECK(!node.needsStyleRecalc());
     DCHECK(!node.childNeedsStyleRecalc());
+    DCHECK(!node.needsReattachLayoutTree());
+    DCHECK(!node.childNeedsReattachLayoutTree());
     DCHECK(!node.childNeedsDistributionRecalc());
     DCHECK(!node.needsStyleInvalidation());
     DCHECK(!node.childNeedsStyleInvalidation());
     for (ShadowRoot* shadowRoot = node.youngestShadowRoot(); shadowRoot;
          shadowRoot = shadowRoot->olderShadowRoot())
       assertLayoutTreeUpdated(*shadowRoot);
   }
 }
 #endif
 
@@ skipping 112 matching lines @@
     m_hasNodesWithPlaceholderStyle = false;
     RefPtr<ComputedStyle> documentStyle =
         StyleResolver::styleForDocument(*this);
     StyleRecalcChange localChange = ComputedStyle::stylePropagationDiff(
         documentStyle.get(), layoutViewItem().style());
     if (localChange != NoChange)
       layoutViewItem().setStyle(documentStyle.release());
   }
 
   clearNeedsStyleRecalc();
+  clearNeedsReattachLayoutTree();
 
   StyleResolver& resolver = ensureStyleResolver();
 
   bool shouldRecordStats;
   TRACE_EVENT_CATEGORY_GROUP_ENABLED("blink,blink_style", &shouldRecordStats);
   styleEngine().setStatsEnabled(shouldRecordStats);
 
   if (Element* documentElement = this->documentElement()) {
     inheritHtmlAndBodyElementStyles(change);
     dirtyElementsForLayerUpdate();
     if (documentElement->shouldCallRecalcStyle(change))
       documentElement->recalcStyle(change);
     while (dirtyElementsForLayerUpdate())
       documentElement->recalcStyle(NoChange);
   }
 
   view()->recalcOverflowAfterStyleChange();
 
   // Only retain the HashMap for the duration of StyleRecalc and
   // LayoutTreeConstruction.
   m_nonAttachedStyle.clear();
   clearChildNeedsStyleRecalc();
+  clearChildNeedsReattachLayoutTree();
 
   resolver.clearStyleSharingList();
 
   m_wasPrinting = m_printing;
 
   DCHECK(!needsStyleRecalc());
   DCHECK(!childNeedsStyleRecalc());
+  DCHECK(!needsReattachLayoutTree());
+  DCHECK(!childNeedsReattachLayoutTree());
   DCHECK(inStyleRecalc());
   DCHECK_EQ(styleResolver(), &resolver);
   DCHECK(m_nonAttachedStyle.isEmpty());
   m_lifecycle.advanceTo(DocumentLifecycle::StyleClean);
   if (shouldRecordStats) {
     TRACE_EVENT_END2("blink,blink_style", "Document::updateStyle",
                      "resolverAccessCount",
                      styleEngine().styleForElementCount() - initialElementCount,
                      "counters", styleEngine().stats()->toTracedValue());
   } else {
@@ skipping 4448 matching lines @@
 }
 
 void showLiveDocumentInstances() {
   WeakDocumentSet& set = liveDocumentSet();
   fprintf(stderr, "There are %u documents currently alive:\n", set.size());
   for (Document* document : set)
     fprintf(stderr, "- Document %p URL: %s\n", document,
             document->url().getString().utf8().data());
 }
 #endif