Changeset 228665 in webkit

Timestamp:

Feb 19, 2018 5:17:03 AM (6 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r228274 - [RenderTreeBuilder] Move RenderElement::removeAnonymousWrappersForInlinesIfNecessary to RenderTreeBuilder
​https://bugs.webkit.org/show_bug.cgi?id=182582
<rdar://problem/37327890>

Reviewed by Antti Koivisto.

Tree mutation -> RenderTreeBuilder.

No change in functionality

• rendering/RenderElement.cpp:

(WebCore::RenderElement::styleDidChange):
(WebCore::RenderElement::removeAnonymousWrappersForInlinesIfNecessary): Deleted.

• rendering/RenderElement.h:
• rendering/updating/RenderTreeBuilder.cpp:

(WebCore::removeAnonymousWrappersForInlinesIfNecessary):
(WebCore::RenderTreeBuilder::childFlowStateChangesAndNoLongerAffectsParentBlock):
(WebCore::RenderTreeBuilder::removeFromParentAndDestroyCleaningUpAnonymousWrappers):

• rendering/updating/RenderTreeBuilder.h:

Location:

releases/WebKitGTK/webkit-2.20/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderElement.cpp (modified) (2 diffs)
• rendering/RenderElement.h (modified) (1 diff)
• rendering/updating/RenderTreeBuilder.cpp (modified) (2 diffs)
• rendering/updating/RenderTreeBuilder.h (modified) (2 diffs)

releases/WebKitGTK/webkit-2.20/Source/WebCore/ChangeLog

@@ +1 @@
+2018-02-08  Zalan Bujtas  <zalan@apple.com>
+
+        [RenderTreeBuilder] Move RenderElement::removeAnonymousWrappersForInlinesIfNecessary to RenderTreeBuilder
+        https://bugs.webkit.org/show_bug.cgi?id=182582
+        <rdar://problem/37327890>
+
+        Reviewed by Antti Koivisto.
+
+        Tree mutation -> RenderTreeBuilder.
+
+        No change in functionality
+
+        * rendering/RenderElement.cpp:
+        (WebCore::RenderElement::styleDidChange):
+        (WebCore::RenderElement::removeAnonymousWrappersForInlinesIfNecessary): Deleted.
+        * rendering/RenderElement.h:
+        * rendering/updating/RenderTreeBuilder.cpp:
+        (WebCore::removeAnonymousWrappersForInlinesIfNecessary):
+        (WebCore::RenderTreeBuilder::childFlowStateChangesAndNoLongerAffectsParentBlock):
+        (WebCore::RenderTreeBuilder::removeFromParentAndDestroyCleaningUpAnonymousWrappers):
+        * rendering/updating/RenderTreeBuilder.h:
+
 2018-02-08  Philippe Normand  <pnormand@igalia.com>
 

releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderElement.cpp

@@ -916 +916 @@
 }
 
-void RenderElement::removeAnonymousWrappersForInlinesIfNecessary()
-{
-    // FIXME: Move to RenderBlock.
-    if (!is<RenderBlock>(*this))
-        return;
-    RenderBlock& thisBlock = downcast<RenderBlock>(*this);
-    if (!thisBlock.canDropAnonymousBlockChild())
-        return;
-
-    // We have changed to floated or out-of-flow positioning so maybe all our parent's
-    // children can be inline now. Bail if there are any block children left on the line,
-    // otherwise we can proceed to stripping solitary anonymous wrappers from the inlines.
-    // FIXME: We should also handle split inlines here - we exclude them at the moment by returning
-    // if we find a continuation.
-    RenderObject* current = firstChild();
-    while (current && ((current->isAnonymousBlock() && !downcast<RenderBlock>(*current).isContinuation()) || current->style().isFloating() || current->style().hasOutOfFlowPosition()))
-        current = current->nextSibling();
-
-    if (current)
-        return;
-
-    RenderObject* next;
-    for (current = firstChild(); current; current = next) {
-        next = current->nextSibling();
-        if (current->isAnonymousBlock())
-            thisBlock.dropAnonymousBoxChild(downcast<RenderBlock>(*current));
-    }
-}
-
 #if !PLATFORM(IOS)
 static bool areNonIdenticalCursorListsEqual(const RenderStyle* a, const RenderStyle* b)
@@ -976 +947 @@
 
     if (s_noLongerAffectsParentBlock)
-        parent()->removeAnonymousWrappersForInlinesIfNecessary();
+        RenderTreeBuilder::current()->childFlowStateChangesAndNoLongerAffectsParentBlock(*this);
 
     SVGRenderSupport::styleChanged(*this, oldStyle);

releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderElement.h

@@ -221 +221 @@
     virtual void updateAnonymousChildStyle(RenderStyle&) const { };
 
-    void removeAnonymousWrappersForInlinesIfNecessary();
-
     bool hasContinuationChainNode() const { return m_hasContinuationChainNode; }
     bool isContinuation() const { return m_isContinuation; }

releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/updating/RenderTreeBuilder.cpp

@@ -319 +319 @@
 }
 
+void RenderTreeBuilder::removeAnonymousWrappersForInlineChildrenIfNeeded(RenderElement& parent)
+{
+    if (!is<RenderBlock>(parent))
+        return;
+    auto& blockParent = downcast<RenderBlock>(parent);
+    if (!blockParent.canDropAnonymousBlockChild())
+        return;
+
+    // We have changed to floated or out-of-flow positioning so maybe all our parent's
+    // children can be inline now. Bail if there are any block children left on the line,
+    // otherwise we can proceed to stripping solitary anonymous wrappers from the inlines.
+    // FIXME: We should also handle split inlines here - we exclude them at the moment by returning
+    // if we find a continuation.
+    auto* current = blockParent.firstChild();
+    while (current && ((current->isAnonymousBlock() && !downcast<RenderBlock>(*current).isContinuation()) || current->style().isFloating() || current->style().hasOutOfFlowPosition()))
+        current = current->nextSibling();
+
+    if (current)
+        return;
+
+    RenderObject* next;
+    for (current = blockParent.firstChild(); current; current = next) {
+        next = current->nextSibling();
+        if (current->isAnonymousBlock())
+            blockParent.dropAnonymousBoxChild(downcast<RenderBlock>(*current));
+    }
+}
+
+void RenderTreeBuilder::childFlowStateChangesAndNoLongerAffectsParentBlock(RenderElement& child)
+{
+    ASSERT(child.parent());
+    removeAnonymousWrappersForInlineChildrenIfNeeded(*child.parent());
+}
+
 static bool isAnonymousAndSafeToDelete(RenderElement& element)
 {
@@ -360 +394 @@
     auto& destroyRootParent = *destroyRoot.parent();
     destroyRootParent.removeAndDestroyChild(*this, destroyRoot);
-    destroyRootParent.removeAnonymousWrappersForInlinesIfNecessary();
+    removeAnonymousWrappersForInlineChildrenIfNeeded(destroyRootParent);
 
     // Anonymous parent might have become empty, try to delete it too.

releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/updating/RenderTreeBuilder.h

@@ -77 +77 @@
     void moveRubyChildren(RenderRubyBase& from, RenderRubyBase& to);
     void childFlowStateChangesAndAffectsParentBlock(RenderElement& child);
+    void childFlowStateChangesAndNoLongerAffectsParentBlock(RenderElement& child);
     RenderObject* resolveMovedChildForMultiColumnFlow(RenderFragmentedFlow& enclosingFragmentedFlow, RenderObject* beforeChild);
     void removeFromParentAndDestroyCleaningUpAnonymousWrappers(RenderObject& child);
@@ -92 +93 @@
     class SVG;
     class MathML;
+
+    void removeAnonymousWrappersForInlineChildrenIfNeeded(RenderElement& parent);
 
     FirstLetter& firstLetterBuilder() { return *m_firstLetterBuilder; }