Changeset 101301 in webkit

Timestamp:

Nov 28, 2011, 4:21:09 PM (15 years ago)

Author:

oliver@apple.com

Message:

Fix V8 bindings codegen and add yet more tests for the typed
array bindings.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/scripts/CodeGeneratorV8.pm (modified) (1 diff)
• bindings/scripts/test/CPP/WebDOMFloat64Array.cpp (modified) (2 diffs)
• bindings/scripts/test/CPP/WebDOMFloat64Array.h (modified) (2 diffs)
• bindings/scripts/test/GObject/WebKitDOMFloat64Array.cpp (modified) (3 diffs)
• bindings/scripts/test/GObject/WebKitDOMFloat64Array.h (modified) (1 diff)
• bindings/scripts/test/JS/JSFloat64Array.cpp (modified) (2 diffs)
• bindings/scripts/test/ObjC/DOMFloat64Array.h (modified) (1 diff)
• bindings/scripts/test/ObjC/DOMFloat64Array.mm (modified) (3 diffs)
• bindings/scripts/test/TestTypedArray.idl (modified) (1 diff)
• bindings/scripts/test/V8/V8Float64Array.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-11-28  Oliver Hunt  <oliver@apple.com>
+
+        Fix V8 bindings codegen and add yet more tests for the typed
+        array bindings.
+
+        * bindings/scripts/CodeGeneratorV8.pm:
+        (AddIncludesForType):
+        * bindings/scripts/test/CPP/WebDOMFloat64Array.cpp:
+        (WebDOMFloat64Array::foo):
+        * bindings/scripts/test/CPP/WebDOMFloat64Array.h:
+        * bindings/scripts/test/GObject/WebKitDOMFloat64Array.cpp:
+        (webkit_dom_float64array_foo):
+        * bindings/scripts/test/GObject/WebKitDOMFloat64Array.h:
+        * bindings/scripts/test/JS/JSFloat64Array.cpp:
+        (WebCore::jsFloat64ArrayPrototypeFunctionFoo):
+        * bindings/scripts/test/ObjC/DOMFloat64Array.h:
+        * bindings/scripts/test/ObjC/DOMFloat64Array.mm:
+        (-[DOMFloat64Array foo:]):
+        * bindings/scripts/test/TestTypedArray.idl:
+        * bindings/scripts/test/V8/V8Float64Array.cpp:
+        (WebCore::Float64ArrayInternal::fooCallback):
+
 2011-11-28  Dana Jansens  <danakj@chromium.org>
 

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

@@ -157 +157 @@
     if (IsTypedArrayType($type)) {
         AddToImplIncludes("wtf/${type}.h");
-        return;
     }
     if (!$codeGenerator->IsPrimitiveType($type) and !$codeGenerator->IsStringType($type) and !$codeGenerator->AvoidInclusionOfType($type) and $type ne "Date") {

trunk/Source/WebCore/bindings/scripts/test/CPP/WebDOMFloat64Array.cpp

@@ -24 +24 @@
 #include "Float32Array.h"
 #include "Float64Array.h"
+#include "Int32Array.h"
 #include "WebDOMFloat32Array.h"
+#include "WebDOMInt32Array.h"
 #include "WebExceptionHandler.h"
 #include <wtf/GetPtr.h>
@@ -44 +46 @@
 }
 
-void WebDOMFloat64Array::foo(const WebDOMFloat32Array& array)
+WebDOMInt32Array WebDOMFloat64Array::foo(const WebDOMFloat32Array& array)
 {
     if (!impl())
-        return;
+        return WebDOMInt32Array();
 
-    impl()->foo(toWebCore(array));
+    return toWebKit(WTF::getPtr(impl()->foo(toWebCore(array))));
 }
 

trunk/Source/WebCore/bindings/scripts/test/CPP/WebDOMFloat64Array.h

@@ -32 +32 @@
 
 class WebDOMFloat32Array;
+class WebDOMInt32Array;
 
 class WebDOMFloat64Array : public WebDOMArrayBufferView {
@@ -39 +40 @@
     virtual ~WebDOMFloat64Array() { }
 
-    void foo(const WebDOMFloat32Array& array);
+    WebDOMInt32Array foo(const WebDOMFloat32Array& array);
 
     WTF::Float64Array* impl() const;

trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMFloat64Array.cpp

@@ -27 +27 @@
 #include "ExceptionCode.h"
 #include "Float64Array.h"
+#include "Int32Array.h"
 #include "JSMainThreadExecState.h"
 #include "WebKitDOMBinding.h"
@@ -34 +35 @@
 #include "webkit/WebKitDOMFloat64Array.h"
 #include "webkit/WebKitDOMFloat64ArrayPrivate.h"
+#include "webkit/WebKitDOMInt32Array.h"
+#include "webkit/WebKitDOMInt32ArrayPrivate.h"
 #include "webkitdefines.h"
 #include "webkitglobalsprivate.h"
@@ -52 +55 @@
 } // namespace WebKit //
 
-void
+WebKitDOMInt32Array*
 webkit_dom_float64array_foo(WebKitDOMFloat64Array* self, WebKitDOMFloat32Array* array)
 {
-    g_return_if_fail(self);
+    g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
     WebCore::Float64Array * item = WebKit::core(self);
-    g_return_if_fail(array);
+    g_return_val_if_fail(array, 0);
     WebCore::Float32Array * converted_array = NULL;
     if (array != NULL) {
         converted_array = WebKit::core(array);
-        g_return_if_fail(converted_array);
+        g_return_val_if_fail(converted_array, 0);
     }
-    item->foo(converted_array);
+    PassRefPtr<WebCore::Int32Array> g_res = WTF::getPtr(item->foo(converted_array));
+    WebKitDOMInt32Array* res = WebKit::kit(g_res.get());
+    return res;
 }
 

trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMFloat64Array.h

@@ -52 +52 @@
  * @array: A #WebKitDOMFloat32Array
  *
- * Returns:
+ * Returns: (transfer none):
  *
 **/
-WEBKIT_API void
+WEBKIT_API WebKitDOMInt32Array*
 webkit_dom_float64array_foo(WebKitDOMFloat64Array* self, WebKitDOMFloat32Array* array);
 

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

@@ -25 +25 @@
 #include "JSDOMBinding.h"
 #include "JSFloat32Array.h"
+#include "JSInt32Array.h"
 #include <runtime/Error.h>
 #include <runtime/PropertyNameArray.h>
 #include <wtf/Float64Array.h>
 #include <wtf/GetPtr.h>
+#include <wtf/Int32Array.h>
 
 using namespace JSC;
@@ -263 +265 @@
     if (exec->hadException())
         return JSValue::encode(jsUndefined());
-    imp->foo(array);
-    return JSValue::encode(jsUndefined());
+
+    JSC::JSValue result = toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->foo(array)));
+    return JSValue::encode(result);
 }
 

trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMFloat64Array.h

@@ -30 +30 @@
 
 @class DOMFloat32Array;
+@class DOMInt32Array;
 
 @interface DOMFloat64Array : DOMArrayBufferView
-- (void)foo:(DOMFloat32Array *)array;
+- (DOMInt32Array *)foo:(DOMFloat32Array *)array;
 @end
 

trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMFloat64Array.mm

@@ -36 +36 @@
 #import "DOMFloat32ArrayInternal.h"
 #import "DOMFloat64ArrayInternal.h"
+#import "DOMInt32ArrayInternal.h"
 #import "DOMNodeInternal.h"
 #import "DOMStyleSheetInternal.h"
@@ -41 +42 @@
 #import "Float32Array.h"
 #import "Float64Array.h"
+#import "Int32Array.h"
 #import "JSMainThreadExecState.h"
 #import "ThreadCheck.h"
@@ -50 +52 @@
 @implementation DOMFloat64Array
 
-- (void)foo:(DOMFloat32Array *)array
+- (DOMInt32Array *)foo:(DOMFloat32Array *)array
 {
     WebCore::JSMainThreadNullState state;
-    IMPL->foo(core(array));
+    return kit(WTF::getPtr(IMPL->foo(core(array))));
 }
 

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

@@ -35 +35 @@
         DontCheckEnums
     ] Float64Array : ArrayBufferView {
-        void foo(in Float32Array array);
+        Int32Array foo(in Float32Array array);
     };
 }

trunk/Source/WebCore/bindings/scripts/test/V8/V8Float64Array.cpp

@@ -30 +30 @@
 #include "V8DOMWrapper.h"
 #include "V8Float32Array.h"
+#include "V8Int32Array.h"
 #include "V8IsolatedContext.h"
 #include "V8Proxy.h"
 #include <wtf/Float32Array.h>
 #include <wtf/Float64Array.h>
+#include <wtf/GetPtr.h>
+#include <wtf/Int32Array.h>
+#include <wtf/RefCounted.h>
+#include <wtf/RefPtr.h>
 #include <wtf/UnusedParam.h>
 
@@ -51 +56 @@
     Float64Array* imp = V8Float64Array::toNative(args.Holder());
     EXCEPTION_BLOCK(Float32Array*, array, V8Float32Array::HasInstance(MAYBE_MISSING_PARAMETER(args, 0, MissingIsUndefined)) ? V8Float32Array::toNative(v8::Handle<v8::Object>::Cast(MAYBE_MISSING_PARAMETER(args, 0, MissingIsUndefined))) : 0);
-    imp->foo(array);
-    return v8::Handle<v8::Value>();
+    return toV8(imp->foo(array));
 }