Pass nextTextSibling to ::before layout rebuild.

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

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Peter Kelly (pmk@post.com)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  *           (C) 2007 David Smith (catfish.man@gmail.com)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013 Apple Inc.
  * All rights reserved.
  *           (C) 2007 Eric Seidel (eric@webkit.org)
  *
@@ skipping 2019 matching lines @@
     AttachContext reattachContext;
     reattachContext.resolvedStyle = document().getNonAttachedStyle(*this);
     bool layoutObjectWillChange = needsAttach() || layoutObject();
     reattachLayoutTree(reattachContext);
     if (layoutObjectWillChange || layoutObject())
       reattachWhitespaceSiblingsIfNeeded(nextTextSibling);
   } else if (childNeedsReattachLayoutTree()) {
     DCHECK(!needsReattachLayoutTree());
     SelectorFilterParentScope filterScope(*this);
     StyleSharingDepthScope sharingScope(*this);
-    reattachPseudoElementLayoutTree(PseudoIdBefore);
-    rebuildShadowRootLayoutTree();
-    rebuildChildrenLayoutTrees();
-    reattachPseudoElementLayoutTree(PseudoIdAfter);
-    reattachPseudoElementLayoutTree(PseudoIdBackdrop);
-    reattachPseudoElementLayoutTree(PseudoIdFirstLetter);
+    Text* nextTextSibling = nullptr;
+    rebuildPseudoElementLayoutTree(PseudoIdAfter);
+    rebuildShadowRootLayoutTree(nextTextSibling);
+    rebuildChildrenLayoutTrees(nextTextSibling);
+    rebuildPseudoElementLayoutTree(PseudoIdBefore, nextTextSibling);
+    rebuildPseudoElementLayoutTree(PseudoIdBackdrop);
+    rebuildPseudoElementLayoutTree(PseudoIdFirstLetter);
   }
   DCHECK(!needsStyleRecalc());
   DCHECK(!childNeedsStyleRecalc());
   DCHECK(!needsReattachLayoutTree());
   DCHECK(!childNeedsReattachLayoutTree());
 }
 
-void Element::rebuildShadowRootLayoutTree() {
+void Element::rebuildShadowRootLayoutTree(Text*& nextTextSibling) {
   for (ShadowRoot* root = youngestShadowRoot(); root;
        root = root->olderShadowRoot()) {
-    if (root->needsReattachLayoutTree() || root->childNeedsReattachLayoutTree())
-      root->rebuildLayoutTree();
+    // TODO(rune@opera.com): nextTextSibling is not set correctly when we have
+    // slotted nodes (crbug.com/648931). Also, it may be incorrect when we have
+    // multiple shadow roots (for V0 shadow hosts).
+    root->rebuildLayoutTree(nextTextSibling);
   }
 }
 
-void Element::reattachPseudoElementLayoutTree(PseudoId pseudoId) {
+void Element::rebuildPseudoElementLayoutTree(PseudoId pseudoId,
+                                             Text* nextTextSibling) {
   if (PseudoElement* element = pseudoElement(pseudoId)) {
     if (element->needsReattachLayoutTree() ||
         element->childNeedsReattachLayoutTree())
-      element->rebuildLayoutTree();
+      element->rebuildLayoutTree(nextTextSibling);
   } else {
     createPseudoElementIfNeeded(pseudoId);
   }
 }
 
 void Element::updateCallbackSelectors(const ComputedStyle* oldStyle,
                                       const ComputedStyle* newStyle) {
   Vector<String> emptyVector;
   const Vector<String>& oldCallbackSelectors =
       oldStyle ? oldStyle->callbackSelectors() : emptyVector;
@@ skipping 2094 matching lines @@
 }
 
 DEFINE_TRACE_WRAPPERS(Element) {
   if (hasRareData()) {
     visitor->traceWrappers(elementRareData());
   }
   ContainerNode::traceWrappers(visitor);
 }
 
 }  // namespace blink