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

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 372 matching lines @@
   while (node->parentNode())
     node = node->parentNode();
   return const_cast<Node&>(*node);
 }
 
 Node* Node::getRootNode(const GetRootNodeOptions& options) const {
   return (options.hasComposed() && options.composed()) ? &shadowIncludingRoot()
                                                        : &treeRoot();
 }
 
+Text* Node::nextTextSibling() const {
+  for (Node* sibling = nextSibling();
+       sibling &&
+       !(sibling->isElementNode() && toElement(sibling)->layoutObject());

[esprehn, 2016/10/17 21:36:26]

Run demorgans :)

(!sibling->isElementNode() || !toElement(sibling)->layoutObject())

[nainar, 2016/10/18 00:04:41]

Done.

+       sibling = sibling->nextSibling()) {
+    if (sibling->isTextNode()) {
+      return toText(sibling);
+    }
+  }
+  return nullptr;
+}
+
 Node* Node::insertBefore(Node* newChild,
                          Node* refChild,
                          ExceptionState& exceptionState) {
   if (isContainerNode())
     return toContainerNode(this)->insertBefore(newChild, refChild,
                                                exceptionState);
 
   exceptionState.throwDOMException(
       HierarchyRequestError, "This node type does not support this method.");
   return nullptr;
@@ skipping 287 matching lines @@
   m_nodeFlags = (m_nodeFlags & ~StyleChangeMask) | changeType;
 }
 
 void Node::markAncestorsWithChildNeedsStyleRecalc() {
   for (ContainerNode* p = parentOrShadowHostNode();
        p && !p->childNeedsStyleRecalc(); p = p->parentOrShadowHostNode())
     p->setChildNeedsStyleRecalc();
   document().scheduleLayoutTreeUpdateIfNeeded();
 }
 
+void Node::markAncestorsWithChildNeedsReattachLayoutTree() {
+  for (ContainerNode* p = parentOrShadowHostNode();
+       p && !p->childNeedsReattachLayoutTree(); p = p->parentOrShadowHostNode())
+    p->setChildNeedsReattachLayoutTree();
+}
+
+void Node::setNeedsReattachLayoutTree() {
+  setFlag(NeedsReattachLayoutTree);
+  markAncestorsWithChildNeedsReattachLayoutTree();
+}
+
 void Node::setNeedsStyleRecalc(StyleChangeType changeType,
                                const StyleChangeReasonForTracing& reason) {
   DCHECK(changeType != NoStyleChange);
   if (!inActiveDocument())
     return;
 
   TRACE_EVENT_INSTANT1(
       TRACE_DISABLED_BY_DEFAULT("devtools.timeline.invalidationTracking"),
       "StyleRecalcInvalidationTracking", TRACE_EVENT_SCOPE_THREAD, "data",
       InspectorStyleRecalcInvalidationTrackingEvent::data(this, reason));
@@ skipping 171 matching lines @@
 
 void Node::attachLayoutTree(const AttachContext&) {
   DCHECK(document().inStyleRecalc() || isDocumentNode());
   DCHECK(!document().lifecycle().inDetach());
   DCHECK(needsAttach());
   DCHECK(!layoutObject() ||
          (layoutObject()->style() &&
           (layoutObject()->parent() || layoutObject()->isLayoutView())));
 
   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())
@@ skipping 1566 matching lines @@
   if (node) {
     std::stringstream stream;
     node->printNodePathTo(stream);
     LOG(INFO) << stream.str();
   } else {
     LOG(INFO) << "Cannot showNodePath for <null>";
   }
 }
 
 #endif