Changeset 228914 in webkit

Timestamp:

Feb 21, 2018 10:17:45 PM (6 years ago)

Author:

Alan Bujtas

Message:

[RenderTreeBuilder] Move RenderObject::insertedInto() mutation logic to RenderTreeBuilder
​https://bugs.webkit.org/show_bug.cgi?id=183022
<rdar://problem/37764326>

Reviewed by Antti Koivisto.

No change in functionality.

• rendering/RenderObject.cpp:

(WebCore::RenderObject::insertedIntoTree):

• rendering/updating/RenderTreeBuilder.cpp:

(WebCore::RenderTreeBuilder::insertChildToRenderElementInternal):
(WebCore::RenderTreeBuilder::moveChildrenTo):
(WebCore::RenderTreeBuilder::multiColumnDescendantInserted): Deleted.

• rendering/updating/RenderTreeBuilder.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderObject.cpp (modified) (1 diff)
• rendering/updating/RenderTreeBuilder.cpp (modified) (5 diffs)
• rendering/updating/RenderTreeBuilder.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-02-21  Zalan Bujtas  <zalan@apple.com>
+
+        [RenderTreeBuilder] Move RenderObject::insertedInto() mutation logic to RenderTreeBuilder
+        https://bugs.webkit.org/show_bug.cgi?id=183022
+        <rdar://problem/37764326>
+
+        Reviewed by Antti Koivisto.
+
+        No change in functionality.
+
+        * rendering/RenderObject.cpp:
+        (WebCore::RenderObject::insertedIntoTree):
+        * rendering/updating/RenderTreeBuilder.cpp:
+        (WebCore::RenderTreeBuilder::insertChildToRenderElementInternal):
+        (WebCore::RenderTreeBuilder::moveChildrenTo):
+        (WebCore::RenderTreeBuilder::multiColumnDescendantInserted): Deleted.
+        * rendering/updating/RenderTreeBuilder.h:
+
 2018-02-21  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebCore/rendering/RenderObject.cpp

@@ -1450 +1450 @@
 {
     // FIXME: We should ASSERT(isRooted()) here but generated content makes some out-of-order insertion.
-
     if (!isFloating() && parent()->childrenInline())
         parent()->dirtyLinesFromChangedChild(*this);
-
-    auto* fragmentedFlow = enclosingFragmentedFlow();
-    if (is<RenderMultiColumnFlow>(fragmentedFlow))
-        RenderTreeBuilder::current()->multiColumnDescendantInserted(downcast<RenderMultiColumnFlow>(*fragmentedFlow), *this);
 }
 

trunk/Source/WebCore/rendering/updating/RenderTreeBuilder.cpp

@@ -388 +388 @@
 
     while (beforeChild && beforeChild->parent() && beforeChild->parent() != &parent)
-    beforeChild = beforeChild->parent();
+        beforeChild = beforeChild->parent();
 
     ASSERT(!beforeChild || beforeChild->parent() == &parent);
@@ -399 +399 @@
     if (!parent.renderTreeBeingDestroyed()) {
         newChild->insertedIntoTree();
+
+        auto* fragmentedFlow = newChild->enclosingFragmentedFlow();
+        if (is<RenderMultiColumnFlow>(fragmentedFlow))
+            multiColumnBuilder().multiColumnDescendantInserted(downcast<RenderMultiColumnFlow>(*fragmentedFlow), *newChild);
+
         if (is<RenderElement>(*newChild))
-        RenderCounter::rendererSubtreeAttached(downcast<RenderElement>(*newChild));
+            RenderCounter::rendererSubtreeAttached(downcast<RenderElement>(*newChild));
     }
 
@@ -406 +411 @@
     parent.setPreferredLogicalWidthsDirty(true);
     if (!parent.normalChildNeedsLayout())
-    parent.setChildNeedsLayout(); // We may supply the static position for an absolute positioned child.
+        parent.setChildNeedsLayout(); // We may supply the static position for an absolute positioned child.
 
     if (AXObjectCache* cache = parent.document().axObjectCache())
-    cache->childrenChanged(&parent, newChild);
+        cache->childrenChanged(&parent, newChild);
     if (is<RenderBlockFlow>(parent))
-    downcast<RenderBlockFlow>(parent).invalidateLineLayoutPath();
+        downcast<RenderBlockFlow>(parent).invalidateLineLayoutPath();
     if (parent.hasOutlineAutoAncestor() || parent.outlineStyleForRepaint().outlineStyleIsAuto())
-    newChild->setHasOutlineAutoAncestor();
+        newChild->setHasOutlineAutoAncestor();
 }
 
@@ -485 +490 @@
             // This is the first letter, skip it.
             if (firstLetterObj == nextSibling)
-            nextSibling = nextSibling->nextSibling();
+                nextSibling = nextSibling->nextSibling();
         }
 
@@ -633 +638 @@
 }
 
-void RenderTreeBuilder::multiColumnDescendantInserted(RenderMultiColumnFlow& flow, RenderObject& newDescendant)
-{
-    multiColumnBuilder().multiColumnDescendantInserted(flow, newDescendant);
-}
-
 static bool isAnonymousAndSafeToDelete(RenderElement& element)
 {

trunk/Source/WebCore/rendering/updating/RenderTreeBuilder.h

@@ -57 +57 @@
     void childFlowStateChangesAndAffectsParentBlock(RenderElement& child);
     void childFlowStateChangesAndNoLongerAffectsParentBlock(RenderElement& child);
-    void multiColumnDescendantInserted(RenderMultiColumnFlow&, RenderObject& newDescendant);
 
 private: