Call Element::rebuildLayoutTree from Document::updateStyle directly

third_party/WebKit/Source/core/dom/Node.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, 2010, 2011 Apple Inc. All
  * rights reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2009 Torch Mobile Inc. All rights reserved.
  * (http://www.torchmobile.com/)
  *
@@ skipping 862 matching lines @@
     if (thisIterator == otherIterator)
       return const_cast<Node*>(thisIterator);
     thisIterator = parent(*thisIterator);
     otherIterator = parent(*otherIterator);
   }
   DCHECK(!otherIterator);
   return nullptr;
 }
 
 void Node::reattachLayoutTree(const AttachContext& context) {
+  DCHECK(!needsStyleRecalc());
+  DCHECK(!childNeedsStyleRecalc());
   AttachContext reattachContext(context);
   reattachContext.performingReattach = true;
 
   // We only need to detach if the node has already been through
   // attachLayoutTree().
-  if (getStyleChangeType() < NeedsReattachStyleChange)
+  if (getStyleChangeType() <= SubtreeStyleChange)

[nainar, 2016/11/29 06:13:39]

Question: This will always be true since SubtreeStyleChange is the max value you
can set StyleChangeType to be now. Should this be ommitted now? Or replaced with
!needsReattachLayoutTree()

[rune, 2016/12/05 10:05:17]

Yes, this test doesn't make sense now. If you setNeedsReattachLayoutTree() in
detachLayoutTree(), the check here should probably be
!needsReattachLayoutTree(), yes.

     detachLayoutTree(reattachContext);
   attachLayoutTree(reattachContext);
+  DCHECK(!needsStyleRecalc());
+  DCHECK(!needsReattachLayoutTree());
 }
 
 void Node::attachLayoutTree(const AttachContext&) {
   DCHECK(document().inStyleRecalc() || isDocumentNode());
   DCHECK(!document().lifecycle().inDetach());
-  DCHECK(needsAttach());
+  DCHECK(needsReattachLayoutTree());
   DCHECK(!layoutObject() ||
          (layoutObject()->style() &&
           (layoutObject()->parent() || layoutObject()->isLayoutView())));
 
+  // Only doing this to cater to the comment in
+  // Document::updateStyleAndLayoutTree() right above the call to
+  // Document::updateStyle().
   clearNeedsStyleRecalc();
   clearNeedsReattachLayoutTree();
 
   if (AXObjectCache* cache = document().axObjectCache())
     cache->updateCacheAfterNodeIsAttached(this);
 }
 
 void Node::detachLayoutTree(const AttachContext& context) {
   DCHECK(document().lifecycle().stateAllowsDetach());
   DocumentLifecycle::DetachScope willDetach(document().lifecycle());
 
   if (layoutObject())
     layoutObject()->destroyAndCleanupAnonymousWrappers();
   setLayoutObject(nullptr);
-  setStyleChange(NeedsReattachStyleChange);
+  setNeedsReattachLayoutTree();

[nainar, 2016/11/29 06:13:39]

Set the relevant NeedsReattachLayoutTree flag. 

   clearChildNeedsStyleInvalidation();
 }
 
 void Node::reattachWhitespaceSiblingsIfNeeded(Text* start) {
   ScriptForbiddenScope forbidScriptDuringRawIteration;
   for (Node* sibling = start; sibling; sibling = sibling->nextSibling()) {
     if (sibling->isTextNode() && toText(sibling)->containsOnlyWhitespace()) {
       bool hadLayoutObject = !!sibling->layoutObject();
       toText(sibling)->reattachLayoutTreeIfNeeded();
       // If sibling's layout object status didn't change we don't need to
@@ skipping 1619 matching lines @@
   if (node) {
     std::stringstream stream;
     node->printNodePathTo(stream);
     LOG(INFO) << stream.str();
   } else {
     LOG(INFO) << "Cannot showNodePath for <null>";
   }
 }
 
 #endif