Changeset 190093 in webkit

Timestamp:

Sep 21, 2015 5:26:06 PM (9 years ago)

Author:

rniwa@webkit.org

Message:

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:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/js/JSDOMBinding.h (modified) (1 diff)
• html/HTMLSlotElement.cpp (modified) (1 diff)
• html/HTMLSlotElement.h (modified) (1 diff)
• html/HTMLSlotElement.idl (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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>
 

trunk/Source/WebCore/bindings/js/JSDOMBinding.h

@@ -456 +456 @@
 }
 
+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>);
 

trunk/Source/WebCore/html/HTMLSlotElement.cpp

@@ -95 +95 @@
 }
 
-Vector<RefPtr<Node>> HTMLSlotElement::getDistributedNodes() const
-{
-    Vector<RefPtr<Node>> distributedNodes;
-
-    if (auto* assignedNodes = this->assignedNodes()) {
-        for (auto* node : *assignedNodes)
-            distributedNodes.append(node);
-    }
-
-    return distributedNodes;
 }
-
-}

trunk/Source/WebCore/html/HTMLSlotElement.h

@@ -39 +39 @@
     const Vector<Node*>* assignedNodes() const;
 
-    Vector<RefPtr<Node>> getDistributedNodes() const;
-
 private:
     HTMLSlotElement(const QualifiedName&, Document&);

trunk/Source/WebCore/html/HTMLSlotElement.idl

@@ -31 +31 @@
 
     [Reflect] attribute DOMString name;
-    sequence<Node> getDistributedNodes();
+    [ImplementedAs=assignedNodes] sequence<Node> getDistributedNodes();
 
 };