Changeset 228547 in webkit

Timestamp:

Feb 15, 2018 6:37:38 PM (6 years ago)

Author:

Alan Bujtas

Message:

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

Reviewed by Antti Koivisto.

No change in functionality.

• rendering/RenderMenuList.cpp:

(RenderMenuList::didInsertChild):
(RenderMenuList::addChild): Deleted.

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

(WebCore::RenderTreeBuilder::insertChild):

• rendering/updating/RenderTreeBuilderFormControls.cpp:

(WebCore::RenderTreeBuilder::FormControls::findOrCreateParentForChild):
(WebCore::RenderTreeBuilder::FormControls::insertChild):
(WebCore::RenderTreeBuilder::FormControls::createInnerRendererIfNeeded): Deleted.

• rendering/updating/RenderTreeBuilderFormControls.h:

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-02-15  Zalan Bujtas  <zalan@apple.com>
+
+        [RenderTreeBuilder] Move RenderMenuList::addChild() to RenderTreeBuilder
+        https://bugs.webkit.org/show_bug.cgi?id=182840
+        <rdar://problem/37583638>
+
+        Reviewed by Antti Koivisto.
+
+        No change in functionality.
+
+        * rendering/RenderMenuList.cpp:
+        (RenderMenuList::didInsertChild):
+        (RenderMenuList::addChild): Deleted.
+        * rendering/RenderMenuList.h:
+        * rendering/updating/RenderTreeBuilder.cpp:
+        (WebCore::RenderTreeBuilder::insertChild):
+        * rendering/updating/RenderTreeBuilderFormControls.cpp:
+        (WebCore::RenderTreeBuilder::FormControls::findOrCreateParentForChild):
+        (WebCore::RenderTreeBuilder::FormControls::insertChild):
+        (WebCore::RenderTreeBuilder::FormControls::createInnerRendererIfNeeded): Deleted.
+        * rendering/updating/RenderTreeBuilderFormControls.h:
+
 2018-02-15  Darin Adler  <darin@apple.com>
 

trunk/Source/WebCore/rendering/RenderMenuList.cpp

@@ -166 +166 @@
 }
 
-void RenderMenuList::addChild(RenderTreeBuilder&, RenderPtr<RenderObject> child, RenderObject*)
+void RenderMenuList::didInsertChild(RenderObject& child, RenderObject*)
 {
     if (AXObjectCache* cache = document().existingAXObjectCache())
-        cache->childrenChanged(this, child.get());
+        cache->childrenChanged(this, &child);
 }
 

trunk/Source/WebCore/rendering/RenderMenuList.h

@@ -63 +63 @@
     void setInnerRenderer(RenderBlock&);
 
+    void didInsertChild(RenderObject& child, RenderObject* beforeChild);
+
 private:
     void willBeDestroyed(RenderTreeBuilder&) override;
@@ -70 +72 @@
     bool isMenuList() const override { return true; }
 
-    void addChild(RenderTreeBuilder&, RenderPtr<RenderObject> newChild, RenderObject* beforeChild = 0) override;
     bool createsAnonymousWrapper() const override { return true; }
 

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

@@ -202 +202 @@
 
     if (is<RenderButton>(parent)) {
-        insertRecursiveIfNeeded(formControlsBuilder().createInnerRendererIfNeeded(downcast<RenderButton>(parent)));
+        formControlsBuilder().insertChild(downcast<RenderButton>(parent), WTFMove(child), beforeChild);
         return;
     }
 
     if (is<RenderMenuList>(parent)) {
-        insertRecursiveIfNeeded(formControlsBuilder().createInnerRendererIfNeeded(downcast<RenderMenuList>(parent)));
+        formControlsBuilder().insertChild(downcast<RenderMenuList>(parent), WTFMove(child), beforeChild);
         return;
     }

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

@@ -37 +37 @@
 }
 
-RenderBlock& RenderTreeBuilder::FormControls::createInnerRendererIfNeeded(RenderButton& button)
+void RenderTreeBuilder::FormControls::insertChild(RenderButton& parent, RenderPtr<RenderObject> child, RenderObject* beforeChild)
 {
-    auto* innerRenderer = button.innerRenderer();
+    m_builder.blockBuilder().insertChild(findOrCreateParentForChild(parent), WTFMove(child), beforeChild);
+}
+
+void RenderTreeBuilder::FormControls::insertChild(RenderMenuList& parent, RenderPtr<RenderObject> child, RenderObject* beforeChild)
+{
+    auto& newChild = *child.get();
+    m_builder.blockBuilder().insertChild(findOrCreateParentForChild(parent), WTFMove(child), beforeChild);
+    parent.didInsertChild(newChild, beforeChild);
+}
+
+RenderBlock& RenderTreeBuilder::FormControls::findOrCreateParentForChild(RenderButton& parent)
+{
+    auto* innerRenderer = parent.innerRenderer();
     if (innerRenderer)
         return *innerRenderer;
 
-    auto wrapper = button.createAnonymousBlock(button.style().display());
+    auto wrapper = parent.createAnonymousBlock(parent.style().display());
     innerRenderer = wrapper.get();
-    button.RenderFlexibleBox::addChild(m_builder, WTFMove(wrapper));
-    button.setInnerRenderer(*innerRenderer);
+    parent.RenderFlexibleBox::addChild(m_builder, WTFMove(wrapper));
+    parent.setInnerRenderer(*innerRenderer);
     return *innerRenderer;
 }
 
-RenderBlock& RenderTreeBuilder::FormControls::createInnerRendererIfNeeded(RenderMenuList& menuList)
+RenderBlock& RenderTreeBuilder::FormControls::findOrCreateParentForChild(RenderMenuList& parent)
 {
-    auto* innerRenderer = menuList.innerRenderer();
+    auto* innerRenderer = parent.innerRenderer();
     if (innerRenderer)
         return *innerRenderer;
 
-    auto wrapper = menuList.createAnonymousBlock();
+    auto wrapper = parent.createAnonymousBlock();
     innerRenderer = wrapper.get();
-    menuList.RenderFlexibleBox::addChild(m_builder, WTFMove(wrapper));
-    menuList.setInnerRenderer(*innerRenderer);
+    parent.RenderFlexibleBox::addChild(m_builder, WTFMove(wrapper));
+    parent.setInnerRenderer(*innerRenderer);
     return *innerRenderer;
 }

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

@@ -38 +38 @@
     FormControls(RenderTreeBuilder&);
 
-    RenderBlock& createInnerRendererIfNeeded(RenderButton&);
-    RenderBlock& createInnerRendererIfNeeded(RenderMenuList&);
+    void insertChild(RenderButton& parent, RenderPtr<RenderObject> child, RenderObject* beforeChild);
+    void insertChild(RenderMenuList& parent, RenderPtr<RenderObject> child, RenderObject* beforeChild);
 
 private:
+    RenderBlock& findOrCreateParentForChild(RenderButton&);
+    RenderBlock& findOrCreateParentForChild(RenderMenuList&);
+
     RenderTreeBuilder& m_builder;
 };