Remove unused [TransferList] extended attribute
authorch.dumez@sisa.samsung.com <ch.dumez@sisa.samsung.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 8 May 2013 10:59:50 +0000 (10:59 +0000)
committerch.dumez@sisa.samsung.com <ch.dumez@sisa.samsung.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 8 May 2013 10:59:50 +0000 (10:59 +0000)
https://bugs.webkit.org/show_bug.cgi?id=115788

Reviewed by Kentaro Hara.

Remove [TransferList] extended attribute and corresponding tests as it has no
effect on the generated JSC bindings.

No new tests, no behavior change.

* bindings/scripts/IDLAttributes.txt:
* bindings/scripts/test/CPP/WebDOMTestSerializedScriptValueInterface.cpp:
* bindings/scripts/test/CPP/WebDOMTestSerializedScriptValueInterface.h:
(WebDOMTestSerializedScriptValueInterface):
* bindings/scripts/test/CPP/WebDOMTestTypedefs.cpp:
* bindings/scripts/test/CPP/WebDOMTestTypedefs.h:
(WebDOMTestTypedefs):
* bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterface.cpp:
* bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterface.h:
* bindings/scripts/test/GObject/WebKitDOMTestTypedefs.cpp:
* bindings/scripts/test/GObject/WebKitDOMTestTypedefs.h:
* bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.cpp:
(WebCore):
(WebCore::JSTestSerializedScriptValueInterfaceConstructor::finishCreation):
* bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.h:
(JSTestSerializedScriptValueInterfacePrototype):
(JSTestSerializedScriptValueInterfaceConstructor):
* bindings/scripts/test/JS/JSTestTypedefs.cpp:
(WebCore):
* bindings/scripts/test/JS/JSTestTypedefs.h:
(WebCore):
* bindings/scripts/test/ObjC/DOMTestSerializedScriptValueInterface.h:
* bindings/scripts/test/ObjC/DOMTestSerializedScriptValueInterface.mm:
* bindings/scripts/test/ObjC/DOMTestTypedefs.h:
* bindings/scripts/test/ObjC/DOMTestTypedefs.mm:
* bindings/scripts/test/TestSerializedScriptValueInterface.idl:
* bindings/scripts/test/TestTypedefs.idl:

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

20 files changed:
Source/WebCore/ChangeLog
Source/WebCore/bindings/scripts/IDLAttributes.txt
Source/WebCore/bindings/scripts/test/CPP/WebDOMTestSerializedScriptValueInterface.cpp
Source/WebCore/bindings/scripts/test/CPP/WebDOMTestSerializedScriptValueInterface.h
Source/WebCore/bindings/scripts/test/CPP/WebDOMTestTypedefs.cpp
Source/WebCore/bindings/scripts/test/CPP/WebDOMTestTypedefs.h
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterface.cpp
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterface.h
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestTypedefs.cpp
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestTypedefs.h
Source/WebCore/bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.cpp
Source/WebCore/bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.h
Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.cpp
Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.h
Source/WebCore/bindings/scripts/test/ObjC/DOMTestSerializedScriptValueInterface.h
Source/WebCore/bindings/scripts/test/ObjC/DOMTestSerializedScriptValueInterface.mm
Source/WebCore/bindings/scripts/test/ObjC/DOMTestTypedefs.h
Source/WebCore/bindings/scripts/test/ObjC/DOMTestTypedefs.mm
Source/WebCore/bindings/scripts/test/TestSerializedScriptValueInterface.idl
Source/WebCore/bindings/scripts/test/TestTypedefs.idl

index 138fb54..6d76f67 100644 (file)
@@ -1,3 +1,43 @@
+2013-05-08  Christophe Dumez  <ch.dumez@sisa.samsung.com>
+
+        Remove unused [TransferList] extended attribute
+        https://bugs.webkit.org/show_bug.cgi?id=115788
+
+        Reviewed by Kentaro Hara.
+
+        Remove [TransferList] extended attribute and corresponding tests as it has no
+        effect on the generated JSC bindings.
+
+        No new tests, no behavior change.
+
+        * bindings/scripts/IDLAttributes.txt:
+        * bindings/scripts/test/CPP/WebDOMTestSerializedScriptValueInterface.cpp:
+        * bindings/scripts/test/CPP/WebDOMTestSerializedScriptValueInterface.h:
+        (WebDOMTestSerializedScriptValueInterface):
+        * bindings/scripts/test/CPP/WebDOMTestTypedefs.cpp:
+        * bindings/scripts/test/CPP/WebDOMTestTypedefs.h:
+        (WebDOMTestTypedefs):
+        * bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterface.cpp:
+        * bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterface.h:
+        * bindings/scripts/test/GObject/WebKitDOMTestTypedefs.cpp:
+        * bindings/scripts/test/GObject/WebKitDOMTestTypedefs.h:
+        * bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.cpp:
+        (WebCore):
+        (WebCore::JSTestSerializedScriptValueInterfaceConstructor::finishCreation):
+        * bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.h:
+        (JSTestSerializedScriptValueInterfacePrototype):
+        (JSTestSerializedScriptValueInterfaceConstructor):
+        * bindings/scripts/test/JS/JSTestTypedefs.cpp:
+        (WebCore):
+        * bindings/scripts/test/JS/JSTestTypedefs.h:
+        (WebCore):
+        * bindings/scripts/test/ObjC/DOMTestSerializedScriptValueInterface.h:
+        * bindings/scripts/test/ObjC/DOMTestSerializedScriptValueInterface.mm:
+        * bindings/scripts/test/ObjC/DOMTestTypedefs.h:
+        * bindings/scripts/test/ObjC/DOMTestTypedefs.mm:
+        * bindings/scripts/test/TestSerializedScriptValueInterface.idl:
+        * bindings/scripts/test/TestTypedefs.idl:
+
 2013-05-08  Dongseong Hwang  <dongseong.hwang@intel.com>
 
         Make optional arguments in CanvasRenderingContext2D match the spec.
index 4ad4d42..c18626b 100644 (file)
@@ -99,7 +99,6 @@ ReturnNewObject
 SkipVTableValidation
 StrictTypeChecking
 SuppressToJSObject
-TransferList=*
 TreatNullAs=NullString
 TreatReturnedNullStringAs=Null|Undefined
 TreatUndefinedAs=NullString
index bafce79..85d7f28 100644 (file)
 
 #include "WebDOMTestSerializedScriptValueInterface.h"
 
-#include "Int32Array.h"
 #include "MessagePortArray.h"
 #include "SerializedScriptValue.h"
-#include "WebDOMInt32Array.h"
 #include "WebDOMMessagePortArray.h"
 #include "WebExceptionHandler.h"
 #include <wtf/GetPtr.h>
@@ -134,22 +132,6 @@ WebDOMString WebDOMTestSerializedScriptValueInterface::cachedReadonlyValue() con
     return impl()->cachedReadonlyValue()->toString();
 }
 
-void WebDOMTestSerializedScriptValueInterface::acceptTransferList(const WebDOMString& data, const WebDOMInt32Array& transferList)
-{
-    if (!impl())
-        return;
-
-    impl()->acceptTransferList(WebCore::SerializedScriptValue::create(WTF::String(data)), toWebCore(transferList));
-}
-
-void WebDOMTestSerializedScriptValueInterface::multiTransferList(const WebDOMString& first, const WebDOMInt32Array& tx, const WebDOMString& second, const WebDOMInt32Array& txx)
-{
-    if (!impl())
-        return;
-
-    impl()->multiTransferList(WebCore::SerializedScriptValue::create(WTF::String(first)), toWebCore(tx), WebCore::SerializedScriptValue::create(WTF::String(second)), toWebCore(txx));
-}
-
 WebCore::TestSerializedScriptValueInterface* toWebCore(const WebDOMTestSerializedScriptValueInterface& wrapper)
 {
     return wrapper.impl();
index 70884f7..11b9340 100644 (file)
@@ -32,7 +32,6 @@ namespace WebCore {
 class TestSerializedScriptValueInterface;
 };
 
-class WebDOMInt32Array;
 class WebDOMMessagePortArray;
 class WebDOMString;
 
@@ -52,9 +51,6 @@ public:
     WebDOMMessagePortArray ports() const;
     WebDOMString cachedReadonlyValue() const;
 
-    void acceptTransferList(const WebDOMString& data, const WebDOMInt32Array& transferList);
-    void multiTransferList(const WebDOMString& first, const WebDOMInt32Array& tx, const WebDOMString& second, const WebDOMInt32Array& txx);
-
     WebCore::TestSerializedScriptValueInterface* impl() const;
 
 protected:
index 0942918..8c46b9c 100644 (file)
 #include "config.h"
 #include "WebDOMTestTypedefs.h"
 
-#include "Int32Array.h"
 #include "KURL.h"
 #include "SVGPoint.h"
 #include "SerializedScriptValue.h"
-#include "WebDOMInt32Array.h"
 #include "WebDOMSVGPoint.h"
 #include "WebDOMString.h"
 #include "WebExceptionHandler.h"
@@ -192,14 +190,6 @@ void WebDOMTestTypedefs::func(const WebDOMlong[]& x)
     impl()->func(toWebCore(x));
 }
 
-void WebDOMTestTypedefs::multiTransferList(const WebDOMString& first, const WebDOMInt32Array& tx, const WebDOMString& second, const WebDOMInt32Array& txx)
-{
-    if (!impl())
-        return;
-
-    impl()->multiTransferList(WebCore::SerializedScriptValue::create(WTF::String(first)), toWebCore(tx), WebCore::SerializedScriptValue::create(WTF::String(second)), toWebCore(txx));
-}
-
 void WebDOMTestTypedefs::setShadow(float width, float height, float blur, const WebDOMString& color, float alpha)
 {
     if (!impl())
index c4d7fc7..968828e 100644 (file)
@@ -31,7 +31,6 @@ class TestTypedefs;
 };
 
 class WebDOMDOMString[];
-class WebDOMInt32Array;
 class WebDOMSVGPoint;
 class WebDOMString;
 class WebDOMlong[];
@@ -58,7 +57,6 @@ public:
     void setStringAttrWithSetterException(const WebDOMString&);
 
     void func(const WebDOMlong[]& x);
-    void multiTransferList(const WebDOMString& first, const WebDOMInt32Array& tx, const WebDOMString& second, const WebDOMInt32Array& txx);
     void setShadow(float width, float height, float blur, const WebDOMString& color, float alpha);
     void nullableArrayArg(const WebDOMDOMString[]& arrayArg);
     WebDOMSVGPoint immutablePointFunction();
index db65fce..ba2efe3 100644 (file)
@@ -25,7 +25,6 @@
 #include "DOMObjectCache.h"
 #include "ExceptionCode.h"
 #include "JSMainThreadExecState.h"
-#include "WebKitDOMInt32ArrayPrivate.h"
 #include "WebKitDOMMessagePortArrayPrivate.h"
 #include "WebKitDOMPrivate.h"
 #include "WebKitDOMSerializedScriptValuePrivate.h"
@@ -219,46 +218,6 @@ static void webkit_dom_test_serialized_script_value_interface_init(WebKitDOMTest
     new (priv) WebKitDOMTestSerializedScriptValueInterfacePrivate();
 }
 
-void
-webkit_dom_test_serialized_script_value_interface_accept_transfer_list(WebKitDOMTestSerializedScriptValueInterface* self, WebKitDOMSerializedScriptValue* data, WebKitDOMInt32Array* transferList)
-{
-#if ENABLE(Condition1) || ENABLE(Condition2)
-    WebCore::JSMainThreadNullState state;
-    g_return_if_fail(WEBKIT_DOM_IS_TEST_SERIALIZED_SCRIPT_VALUE_INTERFACE(self));
-    g_return_if_fail(WEBKIT_DOM_IS_SERIALIZED_SCRIPT_VALUE(data));
-    g_return_if_fail(WEBKIT_DOM_IS_INT32ARRAY(transferList));
-    WebCore::TestSerializedScriptValueInterface* item = WebKit::core(self);
-    WebCore::SerializedScriptValue* convertedData = WebKit::core(data);
-    WebCore::Int32Array* convertedTransferList = WebKit::core(transferList);
-    item->acceptTransferList(convertedData, convertedTransferList);
-#else
-    WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
-    WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition2")
-#endif /* ENABLE(Condition1) || ENABLE(Condition2) */
-}
-
-void
-webkit_dom_test_serialized_script_value_interface_multi_transfer_list(WebKitDOMTestSerializedScriptValueInterface* self, WebKitDOMSerializedScriptValue* first, WebKitDOMInt32Array* tx, WebKitDOMSerializedScriptValue* second, WebKitDOMInt32Array* txx)
-{
-#if ENABLE(Condition1) || ENABLE(Condition2)
-    WebCore::JSMainThreadNullState state;
-    g_return_if_fail(WEBKIT_DOM_IS_TEST_SERIALIZED_SCRIPT_VALUE_INTERFACE(self));
-    g_return_if_fail(WEBKIT_DOM_IS_SERIALIZED_SCRIPT_VALUE(first));
-    g_return_if_fail(WEBKIT_DOM_IS_INT32ARRAY(tx));
-    g_return_if_fail(WEBKIT_DOM_IS_SERIALIZED_SCRIPT_VALUE(second));
-    g_return_if_fail(WEBKIT_DOM_IS_INT32ARRAY(txx));
-    WebCore::TestSerializedScriptValueInterface* item = WebKit::core(self);
-    WebCore::SerializedScriptValue* convertedFirst = WebKit::core(first);
-    WebCore::Int32Array* convertedTx = WebKit::core(tx);
-    WebCore::SerializedScriptValue* convertedSecond = WebKit::core(second);
-    WebCore::Int32Array* convertedTxx = WebKit::core(txx);
-    item->multiTransferList(convertedFirst, convertedTx, convertedSecond, convertedTxx);
-#else
-    WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
-    WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition2")
-#endif /* ENABLE(Condition1) || ENABLE(Condition2) */
-}
-
 WebKitDOMSerializedScriptValue*
 webkit_dom_test_serialized_script_value_interface_get_value(WebKitDOMTestSerializedScriptValueInterface* self)
 {
index 65eec1c..10256c8 100644 (file)
@@ -50,32 +50,6 @@ WEBKIT_API GType
 webkit_dom_test_serialized_script_value_interface_get_type (void);
 
 /**
- * webkit_dom_test_serialized_script_value_interface_accept_transfer_list:
- * @self: A #WebKitDOMTestSerializedScriptValueInterface
- * @data: A #WebKitDOMSerializedScriptValue
- * @transferList: A #WebKitDOMInt32Array
- *
- * Returns:
- *
-**/
-WEBKIT_API void
-webkit_dom_test_serialized_script_value_interface_accept_transfer_list(WebKitDOMTestSerializedScriptValueInterface* self, WebKitDOMSerializedScriptValue* data, WebKitDOMInt32Array* transferList);
-
-/**
- * webkit_dom_test_serialized_script_value_interface_multi_transfer_list:
- * @self: A #WebKitDOMTestSerializedScriptValueInterface
- * @first: A #WebKitDOMSerializedScriptValue
- * @tx: A #WebKitDOMInt32Array
- * @second: A #WebKitDOMSerializedScriptValue
- * @txx: A #WebKitDOMInt32Array
- *
- * Returns:
- *
-**/
-WEBKIT_API void
-webkit_dom_test_serialized_script_value_interface_multi_transfer_list(WebKitDOMTestSerializedScriptValueInterface* self, WebKitDOMSerializedScriptValue* first, WebKitDOMInt32Array* tx, WebKitDOMSerializedScriptValue* second, WebKitDOMInt32Array* txx);
-
-/**
  * webkit_dom_test_serialized_script_value_interface_get_value:
  * @self: A #WebKitDOMTestSerializedScriptValueInterface
  *
index 3799750..d1eb8d3 100644 (file)
@@ -26,7 +26,6 @@
 #include "ExceptionCode.h"
 #include "JSMainThreadExecState.h"
 #include "WebKitDOMDOMString[]Private.h"
-#include "WebKitDOMInt32ArrayPrivate.h"
 #include "WebKitDOMPrivate.h"
 #include "WebKitDOMSVGPointPrivate.h"
 #include "WebKitDOMSerializedScriptValuePrivate.h"
@@ -255,23 +254,6 @@ webkit_dom_test_typedefs_func(WebKitDOMTestTypedefs* self, WebKitDOMlong[]* x)
 }
 
 void
-webkit_dom_test_typedefs_multi_transfer_list(WebKitDOMTestTypedefs* self, WebKitDOMSerializedScriptValue* first, WebKitDOMInt32Array* tx, WebKitDOMSerializedScriptValue* second, WebKitDOMInt32Array* txx)
-{
-    WebCore::JSMainThreadNullState state;
-    g_return_if_fail(WEBKIT_DOM_IS_TEST_TYPEDEFS(self));
-    g_return_if_fail(WEBKIT_DOM_IS_SERIALIZED_SCRIPT_VALUE(first));
-    g_return_if_fail(WEBKIT_DOM_IS_INT32ARRAY(tx));
-    g_return_if_fail(WEBKIT_DOM_IS_SERIALIZED_SCRIPT_VALUE(second));
-    g_return_if_fail(WEBKIT_DOM_IS_INT32ARRAY(txx));
-    WebCore::TestTypedefs* item = WebKit::core(self);
-    WebCore::SerializedScriptValue* convertedFirst = WebKit::core(first);
-    WebCore::Int32Array* convertedTx = WebKit::core(tx);
-    WebCore::SerializedScriptValue* convertedSecond = WebKit::core(second);
-    WebCore::Int32Array* convertedTxx = WebKit::core(txx);
-    item->multiTransferList(convertedFirst, convertedTx, convertedSecond, convertedTxx);
-}
-
-void
 webkit_dom_test_typedefs_set_shadow(WebKitDOMTestTypedefs* self, gfloat width, gfloat height, gfloat blur, const gchar* color, gfloat alpha)
 {
     WebCore::JSMainThreadNullState state;
index 1a4a2a8..c215bb0 100644 (file)
@@ -61,20 +61,6 @@ WEBKIT_API void
 webkit_dom_test_typedefs_func(WebKitDOMTestTypedefs* self, WebKitDOMlong[]* x);
 
 /**
- * webkit_dom_test_typedefs_multi_transfer_list:
- * @self: A #WebKitDOMTestTypedefs
- * @first: A #WebKitDOMSerializedScriptValue
- * @tx: A #WebKitDOMInt32Array
- * @second: A #WebKitDOMSerializedScriptValue
- * @txx: A #WebKitDOMInt32Array
- *
- * Returns:
- *
-**/
-WEBKIT_API void
-webkit_dom_test_typedefs_multi_transfer_list(WebKitDOMTestTypedefs* self, WebKitDOMSerializedScriptValue* first, WebKitDOMInt32Array* tx, WebKitDOMSerializedScriptValue* second, WebKitDOMInt32Array* txx);
-
-/**
  * webkit_dom_test_typedefs_set_shadow:
  * @self: A #WebKitDOMTestTypedefs
  * @width: A #gfloat
index e7534fa..ce7fcff 100644 (file)
 
 #include "JSTestSerializedScriptValueInterface.h"
 
-#include "ExceptionCode.h"
-#include "JSDOMBinding.h"
-#include "JSInt32Array.h"
 #include "JSMessagePort.h"
 #include "MessagePort.h"
 #include "SerializedScriptValue.h"
 #include "TestSerializedScriptValueInterface.h"
-#include <runtime/Error.h>
 #include <runtime/JSArray.h>
 #include <wtf/GetPtr.h>
 
@@ -61,24 +57,6 @@ static const HashTableValue JSTestSerializedScriptValueInterfaceConstructorTable
 };
 
 static const HashTable JSTestSerializedScriptValueInterfaceConstructorTable = { 1, 0, JSTestSerializedScriptValueInterfaceConstructorTableValues, 0 };
-EncodedJSValue JSC_HOST_CALL JSTestSerializedScriptValueInterfaceConstructor::constructJSTestSerializedScriptValueInterface(ExecState* exec)
-{
-    JSTestSerializedScriptValueInterfaceConstructor* castedThis = jsCast<JSTestSerializedScriptValueInterfaceConstructor*>(exec->callee());
-    if (exec->argumentCount() < 2)
-        return throwVMError(exec, createNotEnoughArgumentsError(exec));
-    const String& hello(exec->argument(0).isEmpty() ? String() : exec->argument(0).toString(exec)->value(exec));
-    if (exec->hadException())
-        return JSValue::encode(jsUndefined());
-    RefPtr<SerializedScriptValue> data(SerializedScriptValue::create(exec, exec->argument(1), 0, 0));
-    if (exec->hadException())
-        return JSValue::encode(jsUndefined());
-    Int32Array* transferList(toInt32Array(exec->argument(2)));
-    if (exec->hadException())
-        return JSValue::encode(jsUndefined());
-    RefPtr<TestSerializedScriptValueInterface> object = TestSerializedScriptValueInterface::create(hello, data, transferList);
-    return JSValue::encode(asObject(toJS(exec, castedThis->globalObject(), object.get())));
-}
-
 const ClassInfo JSTestSerializedScriptValueInterfaceConstructor::s_info = { "TestSerializedScriptValueInterfaceConstructor", &Base::s_info, &JSTestSerializedScriptValueInterfaceConstructorTable, 0, CREATE_METHOD_TABLE(JSTestSerializedScriptValueInterfaceConstructor) };
 
 JSTestSerializedScriptValueInterfaceConstructor::JSTestSerializedScriptValueInterfaceConstructor(Structure* structure, JSDOMGlobalObject* globalObject)
@@ -91,7 +69,7 @@ void JSTestSerializedScriptValueInterfaceConstructor::finishCreation(ExecState*
     Base::finishCreation(exec->vm());
     ASSERT(inherits(&s_info));
     putDirect(exec->vm(), exec->propertyNames().prototype, JSTestSerializedScriptValueInterfacePrototype::self(exec, globalObject), DontDelete | ReadOnly);
-    putDirect(exec->vm(), exec->propertyNames().length, jsNumber(2), ReadOnly | DontDelete | DontEnum);
+    putDirect(exec->vm(), exec->propertyNames().length, jsNumber(0), ReadOnly | DontDelete | DontEnum);
 }
 
 bool JSTestSerializedScriptValueInterfaceConstructor::getOwnPropertySlot(JSCell* cell, ExecState* exec, PropertyName propertyName, PropertySlot& slot)
@@ -104,22 +82,14 @@ bool JSTestSerializedScriptValueInterfaceConstructor::getOwnPropertyDescriptor(J
     return getStaticValueDescriptor<JSTestSerializedScriptValueInterfaceConstructor, JSDOMWrapper>(exec, &JSTestSerializedScriptValueInterfaceConstructorTable, jsCast<JSTestSerializedScriptValueInterfaceConstructor*>(object), propertyName, descriptor);
 }
 
-ConstructType JSTestSerializedScriptValueInterfaceConstructor::getConstructData(JSCell*, ConstructData& constructData)
-{
-    constructData.native.function = constructJSTestSerializedScriptValueInterface;
-    return ConstructTypeHost;
-}
-
 /* Hash table for prototype */
 
 static const HashTableValue JSTestSerializedScriptValueInterfacePrototypeTableValues[] =
 {
-    { "acceptTransferList", DontDelete | JSC::Function, (intptr_t)static_cast<NativeFunction>(jsTestSerializedScriptValueInterfacePrototypeFunctionAcceptTransferList), (intptr_t)1, NoIntrinsic },
-    { "multiTransferList", DontDelete | JSC::Function, (intptr_t)static_cast<NativeFunction>(jsTestSerializedScriptValueInterfacePrototypeFunctionMultiTransferList), (intptr_t)0, NoIntrinsic },
     { 0, 0, 0, 0, NoIntrinsic }
 };
 
-static const HashTable JSTestSerializedScriptValueInterfacePrototypeTable = { 5, 3, JSTestSerializedScriptValueInterfacePrototypeTableValues, 0 };
+static const HashTable JSTestSerializedScriptValueInterfacePrototypeTable = { 1, 0, JSTestSerializedScriptValueInterfacePrototypeTableValues, 0 };
 const ClassInfo JSTestSerializedScriptValueInterfacePrototype::s_info = { "TestSerializedScriptValueInterfacePrototype", &Base::s_info, &JSTestSerializedScriptValueInterfacePrototypeTable, 0, CREATE_METHOD_TABLE(JSTestSerializedScriptValueInterfacePrototype) };
 
 JSObject* JSTestSerializedScriptValueInterfacePrototype::self(ExecState* exec, JSGlobalObject* globalObject)
@@ -127,18 +97,6 @@ JSObject* JSTestSerializedScriptValueInterfacePrototype::self(ExecState* exec, J
     return getDOMPrototype<JSTestSerializedScriptValueInterface>(exec, globalObject);
 }
 
-bool JSTestSerializedScriptValueInterfacePrototype::getOwnPropertySlot(JSCell* cell, ExecState* exec, PropertyName propertyName, PropertySlot& slot)
-{
-    JSTestSerializedScriptValueInterfacePrototype* thisObject = jsCast<JSTestSerializedScriptValueInterfacePrototype*>(cell);
-    return getStaticFunctionSlot<JSObject>(exec, &JSTestSerializedScriptValueInterfacePrototypeTable, thisObject, propertyName, slot);
-}
-
-bool JSTestSerializedScriptValueInterfacePrototype::getOwnPropertyDescriptor(JSObject* object, ExecState* exec, PropertyName propertyName, PropertyDescriptor& descriptor)
-{
-    JSTestSerializedScriptValueInterfacePrototype* thisObject = jsCast<JSTestSerializedScriptValueInterfacePrototype*>(object);
-    return getStaticFunctionDescriptor<JSObject>(exec, &JSTestSerializedScriptValueInterfacePrototypeTable, thisObject, propertyName, descriptor);
-}
-
 const ClassInfo JSTestSerializedScriptValueInterface::s_info = { "TestSerializedScriptValueInterface", &Base::s_info, &JSTestSerializedScriptValueInterfaceTable, 0 , CREATE_METHOD_TABLE(JSTestSerializedScriptValueInterface) };
 
 JSTestSerializedScriptValueInterface::JSTestSerializedScriptValueInterface(Structure* structure, JSDOMGlobalObject* globalObject, PassRefPtr<TestSerializedScriptValueInterface> impl)
@@ -281,79 +239,6 @@ JSValue JSTestSerializedScriptValueInterface::getConstructor(ExecState* exec, JS
     return getDOMConstructor<JSTestSerializedScriptValueInterfaceConstructor>(exec, jsCast<JSDOMGlobalObject*>(globalObject));
 }
 
-EncodedJSValue JSC_HOST_CALL jsTestSerializedScriptValueInterfacePrototypeFunctionAcceptTransferList(ExecState* exec)
-{
-    JSValue thisValue = exec->hostThisValue();
-    if (!thisValue.inherits(&JSTestSerializedScriptValueInterface::s_info))
-        return throwVMTypeError(exec);
-    JSTestSerializedScriptValueInterface* castedThis = jsCast<JSTestSerializedScriptValueInterface*>(asObject(thisValue));
-    ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestSerializedScriptValueInterface::s_info);
-    TestSerializedScriptValueInterface* impl = static_cast<TestSerializedScriptValueInterface*>(castedThis->impl());
-    if (exec->argumentCount() < 1)
-        return throwVMError(exec, createNotEnoughArgumentsError(exec));
-    RefPtr<SerializedScriptValue> data(SerializedScriptValue::create(exec, exec->argument(0), 0, 0));
-    if (exec->hadException())
-        return JSValue::encode(jsUndefined());
-
-    size_t argsCount = exec->argumentCount();
-    if (argsCount <= 1) {
-        impl->acceptTransferList(data);
-        return JSValue::encode(jsUndefined());
-    }
-
-    Int32Array* transferList(toInt32Array(exec->argument(1)));
-    if (exec->hadException())
-        return JSValue::encode(jsUndefined());
-    impl->acceptTransferList(data, transferList);
-    return JSValue::encode(jsUndefined());
-}
-
-EncodedJSValue JSC_HOST_CALL jsTestSerializedScriptValueInterfacePrototypeFunctionMultiTransferList(ExecState* exec)
-{
-    JSValue thisValue = exec->hostThisValue();
-    if (!thisValue.inherits(&JSTestSerializedScriptValueInterface::s_info))
-        return throwVMTypeError(exec);
-    JSTestSerializedScriptValueInterface* castedThis = jsCast<JSTestSerializedScriptValueInterface*>(asObject(thisValue));
-    ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestSerializedScriptValueInterface::s_info);
-    TestSerializedScriptValueInterface* impl = static_cast<TestSerializedScriptValueInterface*>(castedThis->impl());
-
-    size_t argsCount = exec->argumentCount();
-    if (argsCount <= 0) {
-        impl->multiTransferList();
-        return JSValue::encode(jsUndefined());
-    }
-
-    RefPtr<SerializedScriptValue> first(SerializedScriptValue::create(exec, exec->argument(0), 0, 0));
-    if (exec->hadException())
-        return JSValue::encode(jsUndefined());
-    if (argsCount <= 1) {
-        impl->multiTransferList(first);
-        return JSValue::encode(jsUndefined());
-    }
-
-    Int32Array* tx(toInt32Array(exec->argument(1)));
-    if (exec->hadException())
-        return JSValue::encode(jsUndefined());
-    if (argsCount <= 2) {
-        impl->multiTransferList(first, tx);
-        return JSValue::encode(jsUndefined());
-    }
-
-    RefPtr<SerializedScriptValue> second(SerializedScriptValue::create(exec, exec->argument(2), 0, 0));
-    if (exec->hadException())
-        return JSValue::encode(jsUndefined());
-    if (argsCount <= 3) {
-        impl->multiTransferList(first, tx, second);
-        return JSValue::encode(jsUndefined());
-    }
-
-    Int32Array* txx(toInt32Array(exec->argument(3)));
-    if (exec->hadException())
-        return JSValue::encode(jsUndefined());
-    impl->multiTransferList(first, tx, second, txx);
-    return JSValue::encode(jsUndefined());
-}
-
 void JSTestSerializedScriptValueInterface::visitChildren(JSCell* cell, SlotVisitor& visitor)
 {
     JSTestSerializedScriptValueInterface* thisObject = jsCast<JSTestSerializedScriptValueInterface*>(cell);
index 3eba54d..1f33d15 100644 (file)
@@ -104,8 +104,6 @@ public:
     }
 
     static const JSC::ClassInfo s_info;
-    static bool getOwnPropertySlot(JSC::JSCell*, JSC::ExecState*, JSC::PropertyName, JSC::PropertySlot&);
-    static bool getOwnPropertyDescriptor(JSC::JSObject*, JSC::ExecState*, JSC::PropertyName, JSC::PropertyDescriptor&);
     static JSC::Structure* createStructure(JSC::VM& vm, JSC::JSGlobalObject* globalObject, JSC::JSValue prototype)
     {
         return JSC::Structure::create(vm, globalObject, prototype, JSC::TypeInfo(JSC::ObjectType, StructureFlags), &s_info);
@@ -114,7 +112,7 @@ public:
 private:
     JSTestSerializedScriptValueInterfacePrototype(JSC::VM& vm, JSC::JSGlobalObject*, JSC::Structure* structure) : JSC::JSNonFinalObject(vm, structure) { }
 protected:
-    static const unsigned StructureFlags = JSC::OverridesGetOwnPropertySlot | JSC::OverridesVisitChildren | Base::StructureFlags;
+    static const unsigned StructureFlags = JSC::OverridesVisitChildren | Base::StructureFlags;
 };
 
 class JSTestSerializedScriptValueInterfaceConstructor : public DOMConstructorObject {
@@ -140,14 +138,8 @@ public:
     }
 protected:
     static const unsigned StructureFlags = JSC::OverridesGetOwnPropertySlot | JSC::ImplementsHasInstance | DOMConstructorObject::StructureFlags;
-    static JSC::EncodedJSValue JSC_HOST_CALL constructJSTestSerializedScriptValueInterface(JSC::ExecState*);
-    static JSC::ConstructType getConstructData(JSC::JSCell*, JSC::ConstructData&);
 };
 
-// Functions
-
-JSC::EncodedJSValue JSC_HOST_CALL jsTestSerializedScriptValueInterfacePrototypeFunctionAcceptTransferList(JSC::ExecState*);
-JSC::EncodedJSValue JSC_HOST_CALL jsTestSerializedScriptValueInterfacePrototypeFunctionMultiTransferList(JSC::ExecState*);
 // Attributes
 
 JSC::JSValue jsTestSerializedScriptValueInterfaceValue(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
index cab301d..06ee558 100644 (file)
@@ -25,7 +25,6 @@
 #include "ExceptionCode.h"
 #include "JSDOMBinding.h"
 #include "JSDOMStringList.h"
-#include "JSInt32Array.h"
 #include "JSSVGPoint.h"
 #include "JSSerializedScriptValue.h"
 #include "JSTestCallback.h"
@@ -117,7 +116,6 @@ ConstructType JSTestTypedefsConstructor::getConstructData(JSCell*, ConstructData
 static const HashTableValue JSTestTypedefsPrototypeTableValues[] =
 {
     { "func", DontDelete | JSC::Function, (intptr_t)static_cast<NativeFunction>(jsTestTypedefsPrototypeFunctionFunc), (intptr_t)0, NoIntrinsic },
-    { "multiTransferList", DontDelete | JSC::Function, (intptr_t)static_cast<NativeFunction>(jsTestTypedefsPrototypeFunctionMultiTransferList), (intptr_t)1, NoIntrinsic },
     { "setShadow", DontDelete | JSC::Function, (intptr_t)static_cast<NativeFunction>(jsTestTypedefsPrototypeFunctionSetShadow), (intptr_t)3, NoIntrinsic },
     { "methodWithSequenceArg", DontDelete | JSC::Function, (intptr_t)static_cast<NativeFunction>(jsTestTypedefsPrototypeFunctionMethodWithSequenceArg), (intptr_t)1, NoIntrinsic },
     { "nullableArrayArg", DontDelete | JSC::Function, (intptr_t)static_cast<NativeFunction>(jsTestTypedefsPrototypeFunctionNullableArrayArg), (intptr_t)1, NoIntrinsic },
@@ -129,7 +127,7 @@ static const HashTableValue JSTestTypedefsPrototypeTableValues[] =
     { 0, 0, 0, 0, NoIntrinsic }
 };
 
-static const HashTable JSTestTypedefsPrototypeTable = { 34, 31, JSTestTypedefsPrototypeTableValues, 0 };
+static const HashTable JSTestTypedefsPrototypeTable = { 33, 31, JSTestTypedefsPrototypeTableValues, 0 };
 const ClassInfo JSTestTypedefsPrototype::s_info = { "TestTypedefsPrototype", &Base::s_info, &JSTestTypedefsPrototypeTable, 0, CREATE_METHOD_TABLE(JSTestTypedefsPrototype) };
 
 JSObject* JSTestTypedefsPrototype::self(ExecState* exec, JSGlobalObject* globalObject)
@@ -380,49 +378,6 @@ EncodedJSValue JSC_HOST_CALL jsTestTypedefsPrototypeFunctionFunc(ExecState* exec
     return JSValue::encode(jsUndefined());
 }
 
-EncodedJSValue JSC_HOST_CALL jsTestTypedefsPrototypeFunctionMultiTransferList(ExecState* exec)
-{
-    JSValue thisValue = exec->hostThisValue();
-    if (!thisValue.inherits(&JSTestTypedefs::s_info))
-        return throwVMTypeError(exec);
-    JSTestTypedefs* castedThis = jsCast<JSTestTypedefs*>(asObject(thisValue));
-    ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestTypedefs::s_info);
-    TestTypedefs* impl = static_cast<TestTypedefs*>(castedThis->impl());
-    if (exec->argumentCount() < 1)
-        return throwVMError(exec, createNotEnoughArgumentsError(exec));
-    RefPtr<SerializedScriptValue> first(SerializedScriptValue::create(exec, exec->argument(0), 0, 0));
-    if (exec->hadException())
-        return JSValue::encode(jsUndefined());
-
-    size_t argsCount = exec->argumentCount();
-    if (argsCount <= 1) {
-        impl->multiTransferList(first);
-        return JSValue::encode(jsUndefined());
-    }
-
-    Int32Array* tx(toInt32Array(exec->argument(1)));
-    if (exec->hadException())
-        return JSValue::encode(jsUndefined());
-    if (argsCount <= 2) {
-        impl->multiTransferList(first, tx);
-        return JSValue::encode(jsUndefined());
-    }
-
-    RefPtr<SerializedScriptValue> second(SerializedScriptValue::create(exec, exec->argument(2), 0, 0));
-    if (exec->hadException())
-        return JSValue::encode(jsUndefined());
-    if (argsCount <= 3) {
-        impl->multiTransferList(first, tx, second);
-        return JSValue::encode(jsUndefined());
-    }
-
-    Int32Array* txx(toInt32Array(exec->argument(3)));
-    if (exec->hadException())
-        return JSValue::encode(jsUndefined());
-    impl->multiTransferList(first, tx, second, txx);
-    return JSValue::encode(jsUndefined());
-}
-
 EncodedJSValue JSC_HOST_CALL jsTestTypedefsPrototypeFunctionSetShadow(ExecState* exec)
 {
     JSValue thisValue = exec->hostThisValue();
index 7b7d151..289ec38 100644 (file)
@@ -141,7 +141,6 @@ protected:
 // Functions
 
 JSC::EncodedJSValue JSC_HOST_CALL jsTestTypedefsPrototypeFunctionFunc(JSC::ExecState*);
-JSC::EncodedJSValue JSC_HOST_CALL jsTestTypedefsPrototypeFunctionMultiTransferList(JSC::ExecState*);
 JSC::EncodedJSValue JSC_HOST_CALL jsTestTypedefsPrototypeFunctionSetShadow(JSC::ExecState*);
 JSC::EncodedJSValue JSC_HOST_CALL jsTestTypedefsPrototypeFunctionMethodWithSequenceArg(JSC::ExecState*);
 JSC::EncodedJSValue JSC_HOST_CALL jsTestTypedefsPrototypeFunctionNullableArrayArg(JSC::ExecState*);
index 3d12dc7..8bdd3e1 100644 (file)
@@ -28,7 +28,6 @@
 
 #if WEBKIT_VERSION_MAX_ALLOWED >= WEBKIT_VERSION_LATEST
 
-@class DOMInt32Array;
 @class DOMMessagePortArray;
 @class NSString;
 
@@ -38,9 +37,6 @@
 @property(retain) NSString *cachedValue;
 @property(readonly, retain) DOMMessagePortArray *ports;
 @property(readonly, retain) NSString *cachedReadonlyValue;
-
-- (void)acceptTransferList:(NSString *)data transferList:(DOMInt32Array *)transferList;
-- (void)multiTransferList:(NSString *)first tx:(DOMInt32Array *)tx second:(NSString *)second txx:(DOMInt32Array *)txx;
 @end
 
 #endif
index faa9f33..38d3ab2 100644 (file)
 #import "DOMCSSRuleInternal.h"
 #import "DOMCSSValueInternal.h"
 #import "DOMEventInternal.h"
-#import "DOMInt32ArrayInternal.h"
 #import "DOMMessagePortArrayInternal.h"
 #import "DOMNodeInternal.h"
 #import "DOMStyleSheetInternal.h"
 #import "DOMTestSerializedScriptValueInterfaceInternal.h"
 #import "ExceptionHandlers.h"
-#import "Int32Array.h"
 #import "JSMainThreadExecState.h"
 #import "MessagePortArray.h"
 #import "SerializedScriptValue.h"
     return IMPL->cachedReadonlyValue()->toString();
 }
 
-- (void)acceptTransferList:(NSString *)data transferList:(DOMInt32Array *)transferList
-{
-    WebCore::JSMainThreadNullState state;
-    IMPL->acceptTransferList(WebCore::SerializedScriptValue::create(WTF::String(data)), core(transferList));
-}
-
-- (void)multiTransferList:(NSString *)first tx:(DOMInt32Array *)tx second:(NSString *)second txx:(DOMInt32Array *)txx
-{
-    WebCore::JSMainThreadNullState state;
-    IMPL->multiTransferList(WebCore::SerializedScriptValue::create(WTF::String(first)), core(tx), WebCore::SerializedScriptValue::create(WTF::String(second)), core(txx));
-}
-
 @end
 
 WebCore::TestSerializedScriptValueInterface* core(DOMTestSerializedScriptValueInterface *wrapper)
index d1c261d..8716a6b 100644 (file)
@@ -28,7 +28,6 @@
 
 #if WEBKIT_VERSION_MAX_ALLOWED >= WEBKIT_VERSION_LATEST
 
-@class DOMInt32Array;
 @class DOMSVGPoint;
 @class NSString;
 
@@ -40,7 +39,6 @@
 @property(copy) NSString *stringAttrWithGetterException;
 @property(copy) NSString *stringAttrWithSetterException;
 
-- (void)multiTransferList:(NSString *)first tx:(DOMInt32Array *)tx second:(NSString *)second txx:(DOMInt32Array *)txx;
 - (void)setShadow:(float)width height:(float)height blur:(float)blur color:(NSString *)color alpha:(float)alpha;
 - (DOMSVGPoint *)immutablePointFunction;
 - (void)methodWithException;
index 90fdafa..bf57d54 100644 (file)
 #import "DOMCSSRuleInternal.h"
 #import "DOMCSSValueInternal.h"
 #import "DOMEventInternal.h"
-#import "DOMInt32ArrayInternal.h"
 #import "DOMNodeInternal.h"
 #import "DOMSVGPointInternal.h"
 #import "DOMStyleSheetInternal.h"
 #import "DOMTestTypedefsInternal.h"
 #import "ExceptionHandlers.h"
-#import "Int32Array.h"
 #import "JSMainThreadExecState.h"
 #import "KURL.h"
 #import "SerializedScriptValue.h"
     WebCore::raiseOnDOMError(ec);
 }
 
-- (void)multiTransferList:(NSString *)first tx:(DOMInt32Array *)tx second:(NSString *)second txx:(DOMInt32Array *)txx
-{
-    WebCore::JSMainThreadNullState state;
-    IMPL->multiTransferList(WebCore::SerializedScriptValue::create(WTF::String(first)), core(tx), WebCore::SerializedScriptValue::create(WTF::String(second)), core(txx));
-}
-
 - (void)setShadow:(float)width height:(float)height blur:(float)blur color:(NSString *)color alpha:(float)alpha
 {
     WebCore::JSMainThreadNullState state;
index 0aa0315..ee7032f 100644 (file)
 // changes in its ouput.
 [
     Conditional=Condition1|Condition2,
-    Constructor(DOMString hello, [TransferList=transferList] SerializedScriptValue data, [Default=Undefined] optional Int32Array transferList),
 ] interface TestSerializedScriptValueInterface {
     attribute SerializedScriptValue value;
     readonly attribute SerializedScriptValue readonlyValue;
     [CachedAttribute] attribute SerializedScriptValue cachedValue;
     readonly attribute MessagePortArray ports;
     [CachedAttribute] readonly attribute SerializedScriptValue cachedReadonlyValue;
-    void acceptTransferList([TransferList=transferList] SerializedScriptValue data, optional Int32Array transferList);
-    void multiTransferList([TransferList=tx] optional SerializedScriptValue first, optional Int32Array tx, [TransferList=txx] optional SerializedScriptValue second, optional Int32Array txx);
 };
index 5011ed1..11d2e48 100644 (file)
@@ -42,8 +42,6 @@
 
     [StrictTypeChecking] void func(optional ARRAY_OF_LONGS x);
 
-    void multiTransferList([TransferList=tx] SCRIPT_VALUE first, optional ARRAY tx, optional TRANSFER_TXX_SCRIPT_VALUE second, optional ARRAY txx);
-
     void setShadow(DOUBLE width, DOUBLE height, float blur, [StrictTypeChecking] optional STRING color, optional DOUBLE alpha);
 
     ULONGLONG methodWithSequenceArg(sequence<SCRIPT_VALUE> sequenceArg);
@@ -77,4 +75,3 @@ typedef TestCallback               TEST_CALLBACK;
 typedef TestSubObjConstructor      T;
 typedef Int32Array                 ARRAY;
 typedef DOMException               E;
-typedef [TransferList=txx] SerializedScriptValue TRANSFER_TXX_SCRIPT_VALUE;