Changeset 107926 in webkit

Timestamp:

Feb 16, 2012 5:46:34 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Add support for unsigned long[] to idl bindings to JSC.
​https://bugs.webkit.org/show_bug.cgi?id=78210

Patch by Kihong Kwon <​kihong.kwon@samsung.com> on 2012-02-16
Reviewed by Kentaro Hara.

Add support for unsigned long[] parameter type in idl.
This patch adds support just for unsigned long[] parameter type.
(support for other types of array should be done in another patch.)

tests added to TestObj.idl.

• bindings/js/JSDOMBinding.h:

(WebCore::jsUnsignedLongArrayToVector):

• bindings/scripts/CodeGeneratorJS.pm:

(AddIncludesForType):
(JSValueToNative):
(NativeToJSValue):

• bindings/scripts/test/JS/JSTestObj.cpp:

(WebCore):
(WebCore::jsTestObjPrototypeFunctionMethodWithUnsignedLongArray):

• bindings/scripts/test/JS/JSTestObj.h:

(WebCore):

• bindings/scripts/test/TestObj.idl:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/js/JSDOMBinding.h (modified) (2 diffs)
• bindings/scripts/CodeGeneratorJS.pm (modified) (4 diffs)
• bindings/scripts/test/JS/JSTestObj.cpp (modified) (2 diffs)
• bindings/scripts/test/JS/JSTestObj.h (modified) (1 diff)
• bindings/scripts/test/TestObj.idl (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-16  Kihong Kwon  <kihong.kwon@samsung.com>
+
+        Add support for unsigned long[] to idl bindings to JSC.
+        https://bugs.webkit.org/show_bug.cgi?id=78210
+
+        Reviewed by Kentaro Hara.
+
+        Add support for unsigned long[] parameter type in idl.
+        This patch adds support just for unsigned long[] parameter type.
+        (support for other types of array should be done in another patch.)
+
+        tests added to TestObj.idl.
+
+        * bindings/js/JSDOMBinding.h:
+        (WebCore::jsUnsignedLongArrayToVector):
+        * bindings/scripts/CodeGeneratorJS.pm:
+        (AddIncludesForType):
+        (JSValueToNative):
+        (NativeToJSValue):
+        * bindings/scripts/test/JS/JSTestObj.cpp:
+        (WebCore):
+        (WebCore::jsTestObjPrototypeFunctionMethodWithUnsignedLongArray):
+        * bindings/scripts/test/JS/JSTestObj.h:
+        (WebCore):
+        * bindings/scripts/test/TestObj.idl:
+
 2012-02-16  Vsevolod Vlasov  <vsevik@chromium.org>
 

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

@@ -39 +39 @@
 #include <wtf/Forward.h>
 #include <wtf/Noncopyable.h>
+#include <wtf/Vector.h>
 
 namespace WebCore {
@@ -343 +344 @@
     }
 
+    inline Vector<unsigned long> jsUnsignedLongArrayToVector(JSC::ExecState* exec, JSC::JSValue value)
+    {
+        unsigned length;
+        JSC::JSObject* object = toJSSequence(exec, value, length);
+        if (exec->hadException())
+            return Vector<unsigned long>();
+
+        Vector<unsigned long> result;
+        for (unsigned i = 0; i < length; i++) {
+            JSC::JSValue indexedValue;
+            indexedValue = object->get(exec, i);
+            if (exec->hadException() || indexedValue.isUndefinedOrNull() || !indexedValue.isNumber())
+                return Vector<unsigned long>();
+            result.append(indexedValue.toUInt32(exec));
+        }
+        return result;
+    }
 } // namespace WebCore
 

trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm

@@ -275 +275 @@
         # FIXME: Add proper support for T[], T[]?, sequence<T>
         $includesRef->{"JSDOMStringList.h"} = 1;
+    } elsif ($type eq "unsigned long[]") {
+        $includesRef->{"<wtf/Vector.h>"} = 1;
     } elsif ($isCallback) {
         $includesRef->{"JS${type}.h"} = 1;
@@ -2763 +2765 @@
     "unsigned long long" => "unsigned long long",
     "MediaQueryListListener" => "RefPtr<MediaQueryListListener>",
-    "DOMTimeStamp" => "DOMTimeStamp"
+    "DOMTimeStamp" => "DOMTimeStamp",
+    "unsigned long[]" => "Vector<unsigned long>"
 );
 
@@ -2892 +2895 @@
     }
 
+    if ($type eq "unsigned long[]") {
+        AddToImplIncludes("JSDOMBinding.h", $conditional);
+        return "jsUnsignedLongArrayToVector(exec, $value)";
+    }
+
     AddToImplIncludes("HTMLOptionElement.h", $conditional) if $type eq "HTMLOptionElement";
     AddToImplIncludes("JSCustomVoidCallback.h", $conditional) if $type eq "VoidCallback";
@@ -2968 +2976 @@
         AddToImplIncludes("SerializedScriptValue.h", $conditional);
         return "$value ? $value->deserialize(exec, castedThis->globalObject(), 0) : jsNull()";
+    } elsif ($type eq "unsigned long[]") {
+        AddToImplIncludes("<wrt/Vector.h>", $conditional);
     } else {
         # Default, include header with same name.

trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp

@@ -288 +288 @@
 #endif
     { "overloadedMethod", DontDelete | JSC::Function, (intptr_t)static_cast<NativeFunction>(jsTestObjPrototypeFunctionOverloadedMethod), (intptr_t)2, NoIntrinsic },
+    { "methodWithUnsignedLongArray", DontDelete | JSC::Function, (intptr_t)static_cast<NativeFunction>(jsTestObjPrototypeFunctionMethodWithUnsignedLongArray), (intptr_t)1, NoIntrinsic },
     { "getSVGDocument", DontDelete | JSC::Function, (intptr_t)static_cast<NativeFunction>(jsTestObjPrototypeFunctionGetSVGDocument), (intptr_t)0, NoIntrinsic },
     { "convert1", DontDelete | JSC::Function, (intptr_t)static_cast<NativeFunction>(jsTestObjPrototypeFunctionConvert1), (intptr_t)1, NoIntrinsic },
@@ -2131 +2132 @@
 #endif
 
+EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithUnsignedLongArray(ExecState* exec)
+{
+    JSValue thisValue = exec->hostThisValue();
+    if (!thisValue.inherits(&JSTestObj::s_info))
+        return throwVMTypeError(exec);
+    JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(thisValue));
+    ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestObj::s_info);
+    TestObj* impl = static_cast<TestObj*>(castedThis->impl());
+    if (exec->argumentCount() < 1)
+        return throwVMError(exec, createTypeError(exec, "Not enough arguments"));
+    Vector<unsigned long> unsignedLongArray(jsUnsignedLongArrayToVector(exec, MAYBE_MISSING_PARAMETER(exec, 0, DefaultIsUndefined)));
+    if (exec->hadException())
+        return JSValue::encode(jsUndefined());
+    impl->methodWithUnsignedLongArray(unsignedLongArray);
+    return JSValue::encode(jsUndefined());
+}
+
 EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionGetSVGDocument(ExecState* exec)
 {

trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.h

@@ -192 +192 @@
 JSC::EncodedJSValue JSC_HOST_CALL jsTestObjConstructorFunctionClassMethodWithOptional(JSC::ExecState*);
 JSC::EncodedJSValue JSC_HOST_CALL jsTestObjConstructorFunctionOverloadedMethod1(JSC::ExecState*);
+JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithUnsignedLongArray(JSC::ExecState*);
 JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionGetSVGDocument(JSC::ExecState*);
 JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionConvert1(JSC::ExecState*);

trunk/Source/WebCore/bindings/scripts/test/TestObj.idl

@@ -195 +195 @@
 #endif
 
+#if defined(TESTING_JS)
+        void methodWithUnsignedLongArray(in unsigned long[] unsignedLongArray);
+#endif
+
         readonly attribute [CheckAccessToNode] Document contentDocument;
         [CheckAccessToNode] SVGDocument getSVGDocument()