Changeset 228414 in webkit

Timestamp:

Feb 12, 2018 7:26:50 PM (6 years ago)

Author:

Alan Bujtas

Message:

[RenderTreeBuilder] Move RenderMenuList::takeChild() to RenderTreeBuilder
​https://bugs.webkit.org/show_bug.cgi?id=182715
<rdar://problem/37477050>

Reviewed by Antti Koivisto.

No change in functionality.

• rendering/RenderMenuList.cpp:

(RenderMenuList::takeChild): Deleted.

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

(WebCore::RenderTreeBuilder::takeChild):
(WebCore::RenderTreeBuilder::takeChildFromRenderMenuList):

• rendering/updating/RenderTreeBuilder.h:

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-02-12  Zalan Bujtas  <zalan@apple.com>
+
+        [RenderTreeBuilder] Move RenderMenuList::takeChild() to RenderTreeBuilder
+        https://bugs.webkit.org/show_bug.cgi?id=182715
+        <rdar://problem/37477050>
+
+        Reviewed by Antti Koivisto.
+
+        No change in functionality.
+
+        * rendering/RenderMenuList.cpp:
+        (RenderMenuList::takeChild): Deleted.
+        * rendering/RenderMenuList.h:
+        * rendering/updating/RenderTreeBuilder.cpp:
+        (WebCore::RenderTreeBuilder::takeChild):
+        (WebCore::RenderTreeBuilder::takeChildFromRenderMenuList):
+        * rendering/updating/RenderTreeBuilder.h:
+
 2018-02-12  Ross Kirsling  <ross.kirsling@sony.com>
 

trunk/Source/WebCore/rendering/RenderMenuList.cpp

@@ -173 +173 @@
 }
 
-RenderPtr<RenderObject> RenderMenuList::takeChild(RenderTreeBuilder& builder, RenderObject& oldChild)
-{
-    if (!m_innerBlock || &oldChild == m_innerBlock)
-        return RenderFlexibleBox::takeChild(builder, oldChild);
-    return builder.takeChild(*m_innerBlock, oldChild);
-}
-
 void RenderMenuList::styleDidChange(StyleDifference diff, const RenderStyle* oldStyle)
 {

trunk/Source/WebCore/rendering/RenderMenuList.h

@@ -71 +71 @@
 
     void addChild(RenderTreeBuilder&, RenderPtr<RenderObject> newChild, RenderObject* beforeChild = 0) override;
-    RenderPtr<RenderObject> takeChild(RenderTreeBuilder&, RenderObject&) override;
     bool createsAnonymousWrapper() const override { return true; }
 

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

@@ -29 +29 @@
 #include "RenderButton.h"
 #include "RenderElement.h"
+#include "RenderMenuList.h"
 #include "RenderRuby.h"
 #include "RenderRubyBase.h"
@@ -199 +200 @@
         return rubyBuilder().takeChild(downcast<RenderRubyRun>(parent), child);
 
+    if (is<RenderMenuList>(parent))
+        return takeChildFromRenderMenuList(downcast<RenderMenuList>(parent), child);
+
     return parent.takeChild(*this, child);
 }
@@ -511 +515 @@
 }
 
-}
+RenderPtr<RenderObject> RenderTreeBuilder::takeChildFromRenderMenuList(RenderMenuList& parent, RenderObject& child)
+{
+    auto* innerRenderer = parent.innerRenderer();
+    if (!innerRenderer || &child == innerRenderer)
+        return parent.RenderBlock::takeChild(*this, child);
+    return takeChild(*innerRenderer, child);
+}
+
+}

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

@@ -31 +31 @@
 
 class RenderMathMLFenced;
+class RenderMenuList;
 class RenderRubyAsBlock;
 class RenderRubyAsInline;
@@ -104 +105 @@
 
     void removeAnonymousWrappersForInlineChildrenIfNeeded(RenderElement& parent);
+    RenderPtr<RenderObject> takeChildFromRenderMenuList(RenderMenuList& parent, RenderObject& child);
 
     FirstLetter& firstLetterBuilder() { return *m_firstLetterBuilder; }