The binding for getDistributedNodes unnecessarily makes a vector of nodes

https://bugs.webkit.org/show_bug.cgi?id=149434

Reviewed by Darin Adler.

Added a jsArray for const Vector<T*>* so that we can generate the binding code for getDistributedNodes()
without having to create Vector<RefPtr<Node>> out of Vector<Node*>*.

* bindings/js/JSDOMBinding.h:
(WebCore::jsArray): Added.
* html/HTMLSlotElement.cpp:
(WebCore::HTMLSlotElement::assignedNodes):
(WebCore::HTMLSlotElement::getDistributedNodes): Deleted.
* html/HTMLSlotElement.h:
* html/HTMLSlotElement.idl:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@190093 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index e004906e3215877d6bd812d502aa06795adcb4ab..ffd87077f5d10e7f5287400fcf5d0e226141dc57 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,21 @@
+2015-09-21  Ryosuke Niwa  <rniwa@webkit.org>
+
+        The binding for getDistributedNodes unnecessarily makes a vector of nodes
+        https://bugs.webkit.org/show_bug.cgi?id=149434
+
+        Reviewed by Darin Adler.
+
+        Added a jsArray for const Vector<T*>* so that we can generate the binding code for getDistributedNodes()
+        without having to create Vector<RefPtr<Node>> out of Vector<Node*>*.
+
+        * bindings/js/JSDOMBinding.h:
+        (WebCore::jsArray): Added.
+        * html/HTMLSlotElement.cpp:
+        (WebCore::HTMLSlotElement::assignedNodes):
+        (WebCore::HTMLSlotElement::getDistributedNodes): Deleted.
+        * html/HTMLSlotElement.h:
+        * html/HTMLSlotElement.idl:
+
 2015-09-21  Brent Fulgham  <bfulgham@apple.com>
 
         [Win] Show tiled drawing debug overlay on Windows

diff --git a/Source/WebCore/bindings/js/JSDOMBinding.h b/Source/WebCore/bindings/js/JSDOMBinding.h
index a20c79494b3a9a3be52a041e716544e9328c6d1b..7312e8d98dda8736f9e9305486ffb61d89d411de 100644 (file)
--- a/Source/WebCore/bindings/js/JSDOMBinding.h
+++ b/Source/WebCore/bindings/js/JSDOMBinding.h
@@ -455,6 +455,13 @@ template<typename T, size_t inlineCapacity> JSC::JSValue jsArray(JSC::ExecState*
     return JSC::constructArray(exec, nullptr, globalObject, list);
 }
 
+template<typename T, size_t inlineCapacity> inline JSC::JSValue jsArray(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, const Vector<T, inlineCapacity>* vector)
+{
+    if (!vector)
+        return JSC::constructEmptyArray(exec, nullptr, globalObject, 0);
+    return jsArray(exec, globalObject, *vector);
+}
+
 WEBCORE_EXPORT JSC::JSValue jsArray(JSC::ExecState*, JSDOMGlobalObject*, PassRefPtr<DOMStringList>);
 
 inline PassRefPtr<JSC::ArrayBufferView> toArrayBufferView(JSC::JSValue value)

diff --git a/Source/WebCore/html/HTMLSlotElement.cpp b/Source/WebCore/html/HTMLSlotElement.cpp
index 720a34a72b13b51b50b35e4eb2b77072c771e924..cfe03ca31fd0ca2f03ddfaac42ccf121377ea9a1 100644 (file)
--- a/Source/WebCore/html/HTMLSlotElement.cpp
+++ b/Source/WebCore/html/HTMLSlotElement.cpp
@@ -94,16 +94,4 @@ const Vector<Node*>* HTMLSlotElement::assignedNodes() const
     return shadowRoot->assignedNodesForSlot(*this);
 }
 
-Vector<RefPtr<Node>> HTMLSlotElement::getDistributedNodes() const
-{
-    Vector<RefPtr<Node>> distributedNodes;
-
-    if (auto* assignedNodes = this->assignedNodes()) {
-        for (auto* node : *assignedNodes)
-            distributedNodes.append(node);
-    }
-
-    return distributedNodes;
-}
-
 }

diff --git a/Source/WebCore/html/HTMLSlotElement.h b/Source/WebCore/html/HTMLSlotElement.h
index 098916ce489854cb7a14ab6a83c0aae25950a14d..f79847317b3e67fd2ecd865ca9e4a677c61704e6 100644 (file)
--- a/Source/WebCore/html/HTMLSlotElement.h
+++ b/Source/WebCore/html/HTMLSlotElement.h
@@ -38,8 +38,6 @@ public:
 
     const Vector<Node*>* assignedNodes() const;
 
-    Vector<RefPtr<Node>> getDistributedNodes() const;
-
 private:
     HTMLSlotElement(const QualifiedName&, Document&);
 

diff --git a/Source/WebCore/html/HTMLSlotElement.idl b/Source/WebCore/html/HTMLSlotElement.idl
index b056ceff9bc2b82f3dbb9aed4e4bef760a32996d..e16d742fdc1dd95ec8148b7593ba3a3d74f2ce8b 100644 (file)
--- a/Source/WebCore/html/HTMLSlotElement.idl
+++ b/Source/WebCore/html/HTMLSlotElement.idl
@@ -30,6 +30,6 @@
 ] interface HTMLSlotElement : HTMLElement {
 
     [Reflect] attribute DOMString name;
-    sequence<Node> getDistributedNodes();
+    [ImplementedAs=assignedNodes] sequence<Node> getDistributedNodes();
 
 };