Call Element::rebuildLayoutTree from Document::updateStyle directly

third_party/WebKit/Source/core/dom/ContainerNode.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, 2013 Apple Inc. All rights
  * reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
@@ skipping 248 matching lines @@
  public:
   inline void operator()(ContainerNode& container, Node& child, Node*) const {
     container.treeScope().adoptIfNeeded(child);
     container.appendChildCommon(child);
   }
 };
 
 Node* ContainerNode::insertBefore(Node* newChild,
                                   Node* refChild,
                                   ExceptionState& exceptionState) {
-  // https://dom.spec.whatwg.org/#concept-node-pre-insert
-
   // insertBefore(node, 0) is equivalent to appendChild(node)
   if (!refChild)
     return appendChild(newChild, exceptionState);
 
   // Make sure adding the new child is OK.
   if (!checkAcceptChild(newChild, 0, exceptionState))
     return newChild;
   DCHECK(newChild);
 
   // NotFoundError: Raised if refChild is not a child of this node
   if (refChild->parentNode() != this) {
     exceptionState.throwDOMException(NotFoundError,
                                      "The node before which the new node is to "
                                      "be inserted is not a child of this "
                                      "node.");
     return nullptr;
   }
 
-  // 3. If reference child is node, set it to node’s next sibling.
-  if (refChild == newChild) {
-    refChild = newChild->nextSibling();
-    if (!refChild)
-      return appendChild(newChild, exceptionState);
-  }
+  // Nothing to do.
+  if (refChild->previousSibling() == newChild || refChild == newChild)
+    return newChild;
 
   NodeVector targets;
   if (!collectChildrenAndRemoveFromOldParentWithCheck(
           refChild, nullptr, *newChild, targets, exceptionState))
     return newChild;
 
   ChildListMutationScope mutation(*this);
   insertNodeVector(targets, refChild, AdoptAndInsertBefore());
   return newChild;
 }
@@ skipping 84 matching lines @@
     DCHECK_EQ(newChild->connectedSubframeCount(), 0u);
     ChildListMutationScope(*this).childAdded(*newChild);
   }
 
   notifyNodeInserted(*newChild, ChildrenChangeSourceParser);
 }
 
 Node* ContainerNode::replaceChild(Node* newChild,
                                   Node* oldChild,
                                   ExceptionState& exceptionState) {
-  // https://dom.spec.whatwg.org/#concept-node-replace
+  if (oldChild == newChild)  // Nothing to do.
+    return oldChild;
 
   if (!oldChild) {
     exceptionState.throwDOMException(NotFoundError,
                                      "The node to be replaced is null.");
     return nullptr;
   }
 
   // Make sure replacing the old child with the new is OK.
   if (!checkAcceptChild(newChild, oldChild, exceptionState))
     return oldChild;
 
   // NotFoundError: Raised if oldChild is not a child of this node.
   if (oldChild->parentNode() != this) {
     exceptionState.throwDOMException(
         NotFoundError, "The node to be replaced is not a child of this node.");
     return nullptr;
   }
 
   ChildListMutationScope mutation(*this);
-  // 7. Let reference child be child’s next sibling.
   Node* next = oldChild->nextSibling();
-  // 8. If reference child is node, set it to node’s next sibling.
-  if (next == newChild)
-    next = newChild->nextSibling();
 
-  // TODO(tkent): According to the specification, we should remove |newChild|
-  // from its parent here, and create a separated mutation record for it.
-  // Refer to imported/wpt/dom/nodes/MutationObserver-childList.html.
-
-  // 12. If child’s parent is not null, run these substeps:
-  //    1. Set removedNodes to a list solely containing child.
-  //    2. Remove child from its parent with the suppress observers flag set.
+  // Remove the node we're replacing.
   removeChild(oldChild, exceptionState);
   if (exceptionState.hadException())
     return nullptr;
 
+  if (next && (next->previousSibling() == newChild ||
+               next == newChild))  // nothing to do
+    return oldChild;
+
   // Does this one more time because removeChild() fires a MutationEvent.
   if (!checkAcceptChild(newChild, oldChild, exceptionState))
     return oldChild;
 
   NodeVector targets;
   if (!collectChildrenAndRemoveFromOldParentWithCheck(next, oldChild, *newChild,
                                                       targets, exceptionState))
     return oldChild;
 
   if (next)
@@ skipping 206 matching lines @@
     dispatchSubtreeModifiedEvent();
 }
 
 Node* ContainerNode::appendChild(Node* newChild,
                                  ExceptionState& exceptionState) {
   // Make sure adding the new child is ok
   if (!checkAcceptChild(newChild, 0, exceptionState))
     return newChild;
   DCHECK(newChild);
 
+  if (newChild == m_lastChild)  // nothing to do
+    return newChild;
+
   NodeVector targets;
   if (!collectChildrenAndRemoveFromOldParentWithCheck(
           nullptr, nullptr, *newChild, targets, exceptionState))
     return newChild;
 
   ChildListMutationScope mutation(*this);
   insertNodeVector(targets, nullptr, AdoptAndAppendChild());
   return newChild;
 }
 
@@ skipping 87 matching lines @@
       notifyNodeRemoved(*shadowRoot);
   }
 }
 
 DISABLE_CFI_PERF
 void ContainerNode::attachLayoutTree(const AttachContext& context) {
   AttachContext childrenContext(context);
   childrenContext.resolvedStyle = nullptr;
 
   for (Node* child = firstChild(); child; child = child->nextSibling()) {
-#if DCHECK_IS_ON()
-    DCHECK(child->needsAttach() ||
-           childAttachedAllowedWhenAttachingChildren(this));

[esprehn, 2017/02/13 22:19:41]

Lets add this back?

[nainar, 2017/02/14 03:42:08]

Done.

-#endif
     if (child->needsAttach())
       child->attachLayoutTree(childrenContext);
   }
 
   clearChildNeedsStyleRecalc();
   clearChildNeedsReattachLayoutTree();
   Node::attachLayoutTree(context);
 }
 
 void ContainerNode::detachLayoutTree(const AttachContext& context) {
@@ skipping 490 matching lines @@
 }
 
 void ContainerNode::setRestyleFlag(DynamicRestyleFlags mask) {
   DCHECK(isElementNode() || isShadowRoot());
   ensureRareData().setRestyleFlag(mask);
 }
 
 void ContainerNode::recalcDescendantStyles(StyleRecalcChange change) {
   DCHECK(document().inStyleRecalc());
   DCHECK(change >= UpdatePseudoElements || childNeedsStyleRecalc());
-  DCHECK(!needsStyleRecalc());

[esprehn, 2017/02/13 22:19:41]

ditto

[nainar, 2017/02/14 03:42:08]

This information isn't true anymore. We are retaining the needsStyleRecalc
information

 
   // This loop is deliberately backwards because we use insertBefore in the
   // layout tree, and want to avoid a potentially n^2 loop to find the insertion
   // point while resolving style.  Having us start from the last child and work
   // our way back means in the common case, we'll find the insertion point in
   // O(1) time.  See crbug.com/288225
   StyleResolver& styleResolver = document().ensureStyleResolver();
   Text* lastTextNode = nullptr;
   for (Node* child = lastChild(); child; child = child->previousSibling()) {
     if (child->isTextNode()) {
       toText(child)->recalcTextStyle(change, lastTextNode);
       lastTextNode = toText(child);
     } else if (child->isElementNode()) {
       Element* element = toElement(child);
       if (element->shouldCallRecalcStyle(change))
         element->recalcStyle(change, lastTextNode);
       else if (element->supportsStyleSharing())
         styleResolver.addToStyleSharingList(*element);
       if (element->layoutObject())
         lastTextNode = nullptr;
     }
   }
 }
 
+void ContainerNode::rebuildChildrenLayoutTrees() {
+  DCHECK(!needsReattachLayoutTree());
+
+  for (Node* child = lastChild(); child; child = child->previousSibling()) {
+    if (child->needsReattachLayoutTree() ||
+        child->childNeedsReattachLayoutTree()) {
+      if (child->isTextNode())
+        toText(child)->rebuildTextLayoutTree();
+      else if (child->isElementNode())
+        toElement(child)->rebuildLayoutTree();
+    }
+  }
+  clearNeedsStyleRecalc();
+  // This is done in ContainerNode::attachLayoutTree but will never be cleared
+  // if we don't enter ContainerNode::attachLayoutTree so we do it here.
+  clearChildNeedsStyleRecalc();
+  clearChildNeedsReattachLayoutTree();
+}
+
 void ContainerNode::checkForSiblingStyleChanges(SiblingCheckType changeType,
                                                 Element* changedElement,
                                                 Node* nodeBeforeChange,
                                                 Node* nodeAfterChange) {
   if (!inActiveDocument() || document().hasPendingForcedStyleRecalc() ||
       getStyleChangeType() >= SubtreeStyleChange)
     return;
 
   if (!hasRestyleFlag(ChildrenAffectedByStructuralRules))
     return;
@@ skipping 159 matching lines @@
     return true;
 
   if (node->isElementNode() && toElement(node)->shadow())
     return true;
 
   return false;
 }
 #endif
 
 }  // namespace blink