Changeset 149729 in webkit


Ignore:
Timestamp:
May 8, 2013 3:59:50 AM (11 years ago)
Author:
Christophe Dumez
Message:

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:
Location:
trunk/Source/WebCore
Files:
20 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r149723 r149729  
     12013-05-08  Christophe Dumez  <ch.dumez@sisa.samsung.com>
     2
     3        Remove unused [TransferList] extended attribute
     4        https://bugs.webkit.org/show_bug.cgi?id=115788
     5
     6        Reviewed by Kentaro Hara.
     7
     8        Remove [TransferList] extended attribute and corresponding tests as it has no
     9        effect on the generated JSC bindings.
     10
     11        No new tests, no behavior change.
     12
     13        * bindings/scripts/IDLAttributes.txt:
     14        * bindings/scripts/test/CPP/WebDOMTestSerializedScriptValueInterface.cpp:
     15        * bindings/scripts/test/CPP/WebDOMTestSerializedScriptValueInterface.h:
     16        (WebDOMTestSerializedScriptValueInterface):
     17        * bindings/scripts/test/CPP/WebDOMTestTypedefs.cpp:
     18        * bindings/scripts/test/CPP/WebDOMTestTypedefs.h:
     19        (WebDOMTestTypedefs):
     20        * bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterface.cpp:
     21        * bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterface.h:
     22        * bindings/scripts/test/GObject/WebKitDOMTestTypedefs.cpp:
     23        * bindings/scripts/test/GObject/WebKitDOMTestTypedefs.h:
     24        * bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.cpp:
     25        (WebCore):
     26        (WebCore::JSTestSerializedScriptValueInterfaceConstructor::finishCreation):
     27        * bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.h:
     28        (JSTestSerializedScriptValueInterfacePrototype):
     29        (JSTestSerializedScriptValueInterfaceConstructor):
     30        * bindings/scripts/test/JS/JSTestTypedefs.cpp:
     31        (WebCore):
     32        * bindings/scripts/test/JS/JSTestTypedefs.h:
     33        (WebCore):
     34        * bindings/scripts/test/ObjC/DOMTestSerializedScriptValueInterface.h:
     35        * bindings/scripts/test/ObjC/DOMTestSerializedScriptValueInterface.mm:
     36        * bindings/scripts/test/ObjC/DOMTestTypedefs.h:
     37        * bindings/scripts/test/ObjC/DOMTestTypedefs.mm:
     38        * bindings/scripts/test/TestSerializedScriptValueInterface.idl:
     39        * bindings/scripts/test/TestTypedefs.idl:
     40
    1412013-05-08  Dongseong Hwang  <dongseong.hwang@intel.com>
    242

  • trunk/Source/WebCore/bindings/scripts/IDLAttributes.txt

    r149356 r149729  
    100100StrictTypeChecking
    101101SuppressToJSObject
    102 TransferList=*
    103102TreatNullAs=NullString
    104103TreatReturnedNullStringAs=Null|Undefined

  • trunk/Source/WebCore/bindings/scripts/test/CPP/WebDOMTestSerializedScriptValueInterface.cpp

    r149257 r149729  
    2525#include "WebDOMTestSerializedScriptValueInterface.h"
    2626
    27 #include "Int32Array.h"
    2827#include "MessagePortArray.h"
    2928#include "SerializedScriptValue.h"
    30 #include "WebDOMInt32Array.h"
    3129#include "WebDOMMessagePortArray.h"
    3230#include "WebExceptionHandler.h"
    … …  
    135133}
    136134
    137 void WebDOMTestSerializedScriptValueInterface::acceptTransferList(const WebDOMString& data, const WebDOMInt32Array& transferList)
    138 {
    139     if (!impl())
    140         return;
    141 
    142     impl()->acceptTransferList(WebCore::SerializedScriptValue::create(WTF::String(data)), toWebCore(transferList));
    143 }
    144 
    145 void WebDOMTestSerializedScriptValueInterface::multiTransferList(const WebDOMString& first, const WebDOMInt32Array& tx, const WebDOMString& second, const WebDOMInt32Array& txx)
    146 {
    147     if (!impl())
    148         return;
    149 
    150     impl()->multiTransferList(WebCore::SerializedScriptValue::create(WTF::String(first)), toWebCore(tx), WebCore::SerializedScriptValue::create(WTF::String(second)), toWebCore(txx));
    151 }
    152 
    153135WebCore::TestSerializedScriptValueInterface* toWebCore(const WebDOMTestSerializedScriptValueInterface& wrapper)
    154136{

  • trunk/Source/WebCore/bindings/scripts/test/CPP/WebDOMTestSerializedScriptValueInterface.h

    r149257 r149729  
    3333};
    3434
    35 class WebDOMInt32Array;
    3635class WebDOMMessagePortArray;
    3736class WebDOMString;
    … …  
    5352    WebDOMString cachedReadonlyValue() const;
    5453
    55     void acceptTransferList(const WebDOMString& data, const WebDOMInt32Array& transferList);
    56     void multiTransferList(const WebDOMString& first, const WebDOMInt32Array& tx, const WebDOMString& second, const WebDOMInt32Array& txx);
    57 
    5854    WebCore::TestSerializedScriptValueInterface* impl() const;
    5955

  • trunk/Source/WebCore/bindings/scripts/test/CPP/WebDOMTestTypedefs.cpp

    r149257 r149729  
    2222#include "WebDOMTestTypedefs.h"
    2323
    24 #include "Int32Array.h"
    2524#include "KURL.h"
    2625#include "SVGPoint.h"
    2726#include "SerializedScriptValue.h"
    28 #include "WebDOMInt32Array.h"
    2927#include "WebDOMSVGPoint.h"
    3028#include "WebDOMString.h"
    … …  
    193191}
    194192
    195 void WebDOMTestTypedefs::multiTransferList(const WebDOMString& first, const WebDOMInt32Array& tx, const WebDOMString& second, const WebDOMInt32Array& txx)
    196 {
    197     if (!impl())
    198         return;
    199 
    200     impl()->multiTransferList(WebCore::SerializedScriptValue::create(WTF::String(first)), toWebCore(tx), WebCore::SerializedScriptValue::create(WTF::String(second)), toWebCore(txx));
    201 }
    202 
    203193void WebDOMTestTypedefs::setShadow(float width, float height, float blur, const WebDOMString& color, float alpha)
    204194{

  • trunk/Source/WebCore/bindings/scripts/test/CPP/WebDOMTestTypedefs.h

    r149257 r149729  
    3232
    3333class WebDOMDOMString[];
    34 class WebDOMInt32Array;
    3534class WebDOMSVGPoint;
    3635class WebDOMString;
    … …  
    5958
    6059    void func(const WebDOMlong[]& x);
    61     void multiTransferList(const WebDOMString& first, const WebDOMInt32Array& tx, const WebDOMString& second, const WebDOMInt32Array& txx);
    6260    void setShadow(float width, float height, float blur, const WebDOMString& color, float alpha);
    6361    void nullableArrayArg(const WebDOMDOMString[]& arrayArg);

  • trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterface.cpp

    r149257 r149729  
    2626#include "ExceptionCode.h"
    2727#include "JSMainThreadExecState.h"
    28 #include "WebKitDOMInt32ArrayPrivate.h"
    2928#include "WebKitDOMMessagePortArrayPrivate.h"
    3029#include "WebKitDOMPrivate.h"
    … …  
    220219}
    221220
    222 void
    223 webkit_dom_test_serialized_script_value_interface_accept_transfer_list(WebKitDOMTestSerializedScriptValueInterface* self, WebKitDOMSerializedScriptValue* data, WebKitDOMInt32Array* transferList)
    224 {
    225 #if ENABLE(Condition1) || ENABLE(Condition2)
    226     WebCore::JSMainThreadNullState state;
    227     g_return_if_fail(WEBKIT_DOM_IS_TEST_SERIALIZED_SCRIPT_VALUE_INTERFACE(self));
    228     g_return_if_fail(WEBKIT_DOM_IS_SERIALIZED_SCRIPT_VALUE(data));
    229     g_return_if_fail(WEBKIT_DOM_IS_INT32ARRAY(transferList));
    230     WebCore::TestSerializedScriptValueInterface* item = WebKit::core(self);
    231     WebCore::SerializedScriptValue* convertedData = WebKit::core(data);
    232     WebCore::Int32Array* convertedTransferList = WebKit::core(transferList);
    233     item->acceptTransferList(convertedData, convertedTransferList);
    234 #else
    235     WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
    236     WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition2")
    237 #endif /* ENABLE(Condition1) || ENABLE(Condition2) */
    238 }
    239 
    240 void
    241 webkit_dom_test_serialized_script_value_interface_multi_transfer_list(WebKitDOMTestSerializedScriptValueInterface* self, WebKitDOMSerializedScriptValue* first, WebKitDOMInt32Array* tx, WebKitDOMSerializedScriptValue* second, WebKitDOMInt32Array* txx)
    242 {
    243 #if ENABLE(Condition1) || ENABLE(Condition2)
    244     WebCore::JSMainThreadNullState state;
    245     g_return_if_fail(WEBKIT_DOM_IS_TEST_SERIALIZED_SCRIPT_VALUE_INTERFACE(self));
    246     g_return_if_fail(WEBKIT_DOM_IS_SERIALIZED_SCRIPT_VALUE(first));
    247     g_return_if_fail(WEBKIT_DOM_IS_INT32ARRAY(tx));
    248     g_return_if_fail(WEBKIT_DOM_IS_SERIALIZED_SCRIPT_VALUE(second));
    249     g_return_if_fail(WEBKIT_DOM_IS_INT32ARRAY(txx));
    250     WebCore::TestSerializedScriptValueInterface* item = WebKit::core(self);
    251     WebCore::SerializedScriptValue* convertedFirst = WebKit::core(first);
    252     WebCore::Int32Array* convertedTx = WebKit::core(tx);
    253     WebCore::SerializedScriptValue* convertedSecond = WebKit::core(second);
    254     WebCore::Int32Array* convertedTxx = WebKit::core(txx);
    255     item->multiTransferList(convertedFirst, convertedTx, convertedSecond, convertedTxx);
    256 #else
    257     WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
    258     WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition2")
    259 #endif /* ENABLE(Condition1) || ENABLE(Condition2) */
    260 }
    261 
    262221WebKitDOMSerializedScriptValue*
    263222webkit_dom_test_serialized_script_value_interface_get_value(WebKitDOMTestSerializedScriptValueInterface* self)

  • trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterface.h

    r149257 r149729  
    4949WEBKIT_API GType
    5050webkit_dom_test_serialized_script_value_interface_get_type (void);
    51 
    52 /**
    53  * webkit_dom_test_serialized_script_value_interface_accept_transfer_list:
    54  * @self: A #WebKitDOMTestSerializedScriptValueInterface
    55  * @data: A #WebKitDOMSerializedScriptValue
    56  * @transferList: A #WebKitDOMInt32Array
    57  *
    58  * Returns:
    59  *
    60 **/
    61 WEBKIT_API void
    62 webkit_dom_test_serialized_script_value_interface_accept_transfer_list(WebKitDOMTestSerializedScriptValueInterface* self, WebKitDOMSerializedScriptValue* data, WebKitDOMInt32Array* transferList);
    63 
    64 /**
    65  * webkit_dom_test_serialized_script_value_interface_multi_transfer_list:
    66  * @self: A #WebKitDOMTestSerializedScriptValueInterface
    67  * @first: A #WebKitDOMSerializedScriptValue
    68  * @tx: A #WebKitDOMInt32Array
    69  * @second: A #WebKitDOMSerializedScriptValue
    70  * @txx: A #WebKitDOMInt32Array
    71  *
    72  * Returns:
    73  *
    74 **/
    75 WEBKIT_API void
    76 webkit_dom_test_serialized_script_value_interface_multi_transfer_list(WebKitDOMTestSerializedScriptValueInterface* self, WebKitDOMSerializedScriptValue* first, WebKitDOMInt32Array* tx, WebKitDOMSerializedScriptValue* second, WebKitDOMInt32Array* txx);
    7751
    7852/**

  • trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestTypedefs.cpp

    r149257 r149729  
    2727#include "JSMainThreadExecState.h"
    2828#include "WebKitDOMDOMString[]Private.h"
    29 #include "WebKitDOMInt32ArrayPrivate.h"
    3029#include "WebKitDOMPrivate.h"
    3130#include "WebKitDOMSVGPointPrivate.h"
    … …  
    256255
    257256void
    258 webkit_dom_test_typedefs_multi_transfer_list(WebKitDOMTestTypedefs* self, WebKitDOMSerializedScriptValue* first, WebKitDOMInt32Array* tx, WebKitDOMSerializedScriptValue* second, WebKitDOMInt32Array* txx)
    259 {
    260     WebCore::JSMainThreadNullState state;
    261     g_return_if_fail(WEBKIT_DOM_IS_TEST_TYPEDEFS(self));
    262     g_return_if_fail(WEBKIT_DOM_IS_SERIALIZED_SCRIPT_VALUE(first));
    263     g_return_if_fail(WEBKIT_DOM_IS_INT32ARRAY(tx));
    264     g_return_if_fail(WEBKIT_DOM_IS_SERIALIZED_SCRIPT_VALUE(second));
    265     g_return_if_fail(WEBKIT_DOM_IS_INT32ARRAY(txx));
    266     WebCore::TestTypedefs* item = WebKit::core(self);
    267     WebCore::SerializedScriptValue* convertedFirst = WebKit::core(first);
    268     WebCore::Int32Array* convertedTx = WebKit::core(tx);
    269     WebCore::SerializedScriptValue* convertedSecond = WebKit::core(second);
    270     WebCore::Int32Array* convertedTxx = WebKit::core(txx);
    271     item->multiTransferList(convertedFirst, convertedTx, convertedSecond, convertedTxx);
    272 }
    273 
    274 void
    275257webkit_dom_test_typedefs_set_shadow(WebKitDOMTestTypedefs* self, gfloat width, gfloat height, gfloat blur, const gchar* color, gfloat alpha)
    276258{

  • trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestTypedefs.h

    r149257 r149729  
    6262
    6363/**
    64  * webkit_dom_test_typedefs_multi_transfer_list:
    65  * @self: A #WebKitDOMTestTypedefs
    66  * @first: A #WebKitDOMSerializedScriptValue
    67  * @tx: A #WebKitDOMInt32Array
    68  * @second: A #WebKitDOMSerializedScriptValue
    69  * @txx: A #WebKitDOMInt32Array
    70  *
    71  * Returns:
    72  *
    73 **/
    74 WEBKIT_API void
    75 webkit_dom_test_typedefs_multi_transfer_list(WebKitDOMTestTypedefs* self, WebKitDOMSerializedScriptValue* first, WebKitDOMInt32Array* tx, WebKitDOMSerializedScriptValue* second, WebKitDOMInt32Array* txx);
    76 
    77 /**
    7864 * webkit_dom_test_typedefs_set_shadow:
    7965 * @self: A #WebKitDOMTestTypedefs

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.cpp

    r149257 r149729  
    2525#include "JSTestSerializedScriptValueInterface.h"
    2626
    27 #include "ExceptionCode.h"
    28 #include "JSDOMBinding.h"
    29 #include "JSInt32Array.h"
    3027#include "JSMessagePort.h"
    3128#include "MessagePort.h"
    3229#include "SerializedScriptValue.h"
    3330#include "TestSerializedScriptValueInterface.h"
    34 #include <runtime/Error.h>
    3531#include <runtime/JSArray.h>
    3632#include <wtf/GetPtr.h>
    … …  
    6258
    6359static const HashTable JSTestSerializedScriptValueInterfaceConstructorTable = { 1, 0, JSTestSerializedScriptValueInterfaceConstructorTableValues, 0 };
    64 EncodedJSValue JSC_HOST_CALL JSTestSerializedScriptValueInterfaceConstructor::constructJSTestSerializedScriptValueInterface(ExecState* exec)
    65 {
    66     JSTestSerializedScriptValueInterfaceConstructor* castedThis = jsCast<JSTestSerializedScriptValueInterfaceConstructor*>(exec->callee());
    67     if (exec->argumentCount() < 2)
    68         return throwVMError(exec, createNotEnoughArgumentsError(exec));
    69     const String& hello(exec->argument(0).isEmpty() ? String() : exec->argument(0).toString(exec)->value(exec));
    70     if (exec->hadException())
    71         return JSValue::encode(jsUndefined());
    72     RefPtr<SerializedScriptValue> data(SerializedScriptValue::create(exec, exec->argument(1), 0, 0));
    73     if (exec->hadException())
    74         return JSValue::encode(jsUndefined());
    75     Int32Array* transferList(toInt32Array(exec->argument(2)));
    76     if (exec->hadException())
    77         return JSValue::encode(jsUndefined());
    78     RefPtr<TestSerializedScriptValueInterface> object = TestSerializedScriptValueInterface::create(hello, data, transferList);
    79     return JSValue::encode(asObject(toJS(exec, castedThis->globalObject(), object.get())));
    80 }
    81 
    8260const ClassInfo JSTestSerializedScriptValueInterfaceConstructor::s_info = { "TestSerializedScriptValueInterfaceConstructor", &Base::s_info, &JSTestSerializedScriptValueInterfaceConstructorTable, 0, CREATE_METHOD_TABLE(JSTestSerializedScriptValueInterfaceConstructor) };
    8361
    … …  
    9270    ASSERT(inherits(&s_info));
    9371    putDirect(exec->vm(), exec->propertyNames().prototype, JSTestSerializedScriptValueInterfacePrototype::self(exec, globalObject), DontDelete | ReadOnly);
    94     putDirect(exec->vm(), exec->propertyNames().length, jsNumber(2), ReadOnly | DontDelete | DontEnum);
     72    putDirect(exec->vm(), exec->propertyNames().length, jsNumber(0), ReadOnly | DontDelete | DontEnum);
    9573}
    9674
    … …  
    10583}
    10684
    107 ConstructType JSTestSerializedScriptValueInterfaceConstructor::getConstructData(JSCell*, ConstructData& constructData)
    108 {
    109     constructData.native.function = constructJSTestSerializedScriptValueInterface;
    110     return ConstructTypeHost;
    111 }
    112 
    11385/* Hash table for prototype */
    11486
    11587static const HashTableValue JSTestSerializedScriptValueInterfacePrototypeTableValues[] =
    11688{
    117     { "acceptTransferList", DontDelete | JSC::Function, (intptr_t)static_cast<NativeFunction>(jsTestSerializedScriptValueInterfacePrototypeFunctionAcceptTransferList), (intptr_t)1, NoIntrinsic },
    118     { "multiTransferList", DontDelete | JSC::Function, (intptr_t)static_cast<NativeFunction>(jsTestSerializedScriptValueInterfacePrototypeFunctionMultiTransferList), (intptr_t)0, NoIntrinsic },
    11989    { 0, 0, 0, 0, NoIntrinsic }
    12090};
    12191
    122 static const HashTable JSTestSerializedScriptValueInterfacePrototypeTable = { 5, 3, JSTestSerializedScriptValueInterfacePrototypeTableValues, 0 };
     92static const HashTable JSTestSerializedScriptValueInterfacePrototypeTable = { 1, 0, JSTestSerializedScriptValueInterfacePrototypeTableValues, 0 };
    12393const ClassInfo JSTestSerializedScriptValueInterfacePrototype::s_info = { "TestSerializedScriptValueInterfacePrototype", &Base::s_info, &JSTestSerializedScriptValueInterfacePrototypeTable, 0, CREATE_METHOD_TABLE(JSTestSerializedScriptValueInterfacePrototype) };
    12494
    … …  
    12696{
    12797    return getDOMPrototype<JSTestSerializedScriptValueInterface>(exec, globalObject);
    128 }
    129 
    130 bool JSTestSerializedScriptValueInterfacePrototype::getOwnPropertySlot(JSCell* cell, ExecState* exec, PropertyName propertyName, PropertySlot& slot)
    131 {
    132     JSTestSerializedScriptValueInterfacePrototype* thisObject = jsCast<JSTestSerializedScriptValueInterfacePrototype*>(cell);
    133     return getStaticFunctionSlot<JSObject>(exec, &JSTestSerializedScriptValueInterfacePrototypeTable, thisObject, propertyName, slot);
    134 }
    135 
    136 bool JSTestSerializedScriptValueInterfacePrototype::getOwnPropertyDescriptor(JSObject* object, ExecState* exec, PropertyName propertyName, PropertyDescriptor& descriptor)
    137 {
    138     JSTestSerializedScriptValueInterfacePrototype* thisObject = jsCast<JSTestSerializedScriptValueInterfacePrototype*>(object);
    139     return getStaticFunctionDescriptor<JSObject>(exec, &JSTestSerializedScriptValueInterfacePrototypeTable, thisObject, propertyName, descriptor);
    14098}
    14199
    … …  
    280238{
    281239    return getDOMConstructor<JSTestSerializedScriptValueInterfaceConstructor>(exec, jsCast<JSDOMGlobalObject*>(globalObject));
    282 }
    283 
    284 EncodedJSValue JSC_HOST_CALL jsTestSerializedScriptValueInterfacePrototypeFunctionAcceptTransferList(ExecState* exec)
    285 {
    286     JSValue thisValue = exec->hostThisValue();
    287     if (!thisValue.inherits(&JSTestSerializedScriptValueInterface::s_info))
    288         return throwVMTypeError(exec);
    289     JSTestSerializedScriptValueInterface* castedThis = jsCast<JSTestSerializedScriptValueInterface*>(asObject(thisValue));
    290     ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestSerializedScriptValueInterface::s_info);
    291     TestSerializedScriptValueInterface* impl = static_cast<TestSerializedScriptValueInterface*>(castedThis->impl());
    292     if (exec->argumentCount() < 1)
    293         return throwVMError(exec, createNotEnoughArgumentsError(exec));
    294     RefPtr<SerializedScriptValue> data(SerializedScriptValue::create(exec, exec->argument(0), 0, 0));
    295     if (exec->hadException())
    296         return JSValue::encode(jsUndefined());
    297 
    298     size_t argsCount = exec->argumentCount();
    299     if (argsCount <= 1) {
    300         impl->acceptTransferList(data);
    301         return JSValue::encode(jsUndefined());
    302     }
    303 
    304     Int32Array* transferList(toInt32Array(exec->argument(1)));
    305     if (exec->hadException())
    306         return JSValue::encode(jsUndefined());
    307     impl->acceptTransferList(data, transferList);
    308     return JSValue::encode(jsUndefined());
    309 }
    310 
    311 EncodedJSValue JSC_HOST_CALL jsTestSerializedScriptValueInterfacePrototypeFunctionMultiTransferList(ExecState* exec)
    312 {
    313     JSValue thisValue = exec->hostThisValue();
    314     if (!thisValue.inherits(&JSTestSerializedScriptValueInterface::s_info))
    315         return throwVMTypeError(exec);
    316     JSTestSerializedScriptValueInterface* castedThis = jsCast<JSTestSerializedScriptValueInterface*>(asObject(thisValue));
    317     ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestSerializedScriptValueInterface::s_info);
    318     TestSerializedScriptValueInterface* impl = static_cast<TestSerializedScriptValueInterface*>(castedThis->impl());
    319 
    320     size_t argsCount = exec->argumentCount();
    321     if (argsCount <= 0) {
    322         impl->multiTransferList();
    323         return JSValue::encode(jsUndefined());
    324     }
    325 
    326     RefPtr<SerializedScriptValue> first(SerializedScriptValue::create(exec, exec->argument(0), 0, 0));
    327     if (exec->hadException())
    328         return JSValue::encode(jsUndefined());
    329     if (argsCount <= 1) {
    330         impl->multiTransferList(first);
    331         return JSValue::encode(jsUndefined());
    332     }
    333 
    334     Int32Array* tx(toInt32Array(exec->argument(1)));
    335     if (exec->hadException())
    336         return JSValue::encode(jsUndefined());
    337     if (argsCount <= 2) {
    338         impl->multiTransferList(first, tx);
    339         return JSValue::encode(jsUndefined());
    340     }
    341 
    342     RefPtr<SerializedScriptValue> second(SerializedScriptValue::create(exec, exec->argument(2), 0, 0));
    343     if (exec->hadException())
    344         return JSValue::encode(jsUndefined());
    345     if (argsCount <= 3) {
    346         impl->multiTransferList(first, tx, second);
    347         return JSValue::encode(jsUndefined());
    348     }
    349 
    350     Int32Array* txx(toInt32Array(exec->argument(3)));
    351     if (exec->hadException())
    352         return JSValue::encode(jsUndefined());
    353     impl->multiTransferList(first, tx, second, txx);
    354     return JSValue::encode(jsUndefined());
    355240}
    356241

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.h

    r148696 r149729  
    105105
    106106    static const JSC::ClassInfo s_info;
    107     static bool getOwnPropertySlot(JSC::JSCell*, JSC::ExecState*, JSC::PropertyName, JSC::PropertySlot&);
    108     static bool getOwnPropertyDescriptor(JSC::JSObject*, JSC::ExecState*, JSC::PropertyName, JSC::PropertyDescriptor&);
    109107    static JSC::Structure* createStructure(JSC::VM& vm, JSC::JSGlobalObject* globalObject, JSC::JSValue prototype)
    110108    {
    … …  
    115113    JSTestSerializedScriptValueInterfacePrototype(JSC::VM& vm, JSC::JSGlobalObject*, JSC::Structure* structure) : JSC::JSNonFinalObject(vm, structure) { }
    116114protected:
    117     static const unsigned StructureFlags = JSC::OverridesGetOwnPropertySlot | JSC::OverridesVisitChildren | Base::StructureFlags;
     115    static const unsigned StructureFlags = JSC::OverridesVisitChildren | Base::StructureFlags;
    118116};
    119117
    … …  
    141139protected:
    142140    static const unsigned StructureFlags = JSC::OverridesGetOwnPropertySlot | JSC::ImplementsHasInstance | DOMConstructorObject::StructureFlags;
    143     static JSC::EncodedJSValue JSC_HOST_CALL constructJSTestSerializedScriptValueInterface(JSC::ExecState*);
    144     static JSC::ConstructType getConstructData(JSC::JSCell*, JSC::ConstructData&);
    145141};
    146142
    147 // Functions
    148 
    149 JSC::EncodedJSValue JSC_HOST_CALL jsTestSerializedScriptValueInterfacePrototypeFunctionAcceptTransferList(JSC::ExecState*);
    150 JSC::EncodedJSValue JSC_HOST_CALL jsTestSerializedScriptValueInterfacePrototypeFunctionMultiTransferList(JSC::ExecState*);
    151143// Attributes
    152144

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.cpp

    r149257 r149729  
    2626#include "JSDOMBinding.h"
    2727#include "JSDOMStringList.h"
    28 #include "JSInt32Array.h"
    2928#include "JSSVGPoint.h"
    3029#include "JSSerializedScriptValue.h"
    … …  
    118117{
    119118    { "func", DontDelete | JSC::Function, (intptr_t)static_cast<NativeFunction>(jsTestTypedefsPrototypeFunctionFunc), (intptr_t)0, NoIntrinsic },
    120     { "multiTransferList", DontDelete | JSC::Function, (intptr_t)static_cast<NativeFunction>(jsTestTypedefsPrototypeFunctionMultiTransferList), (intptr_t)1, NoIntrinsic },
    121119    { "setShadow", DontDelete | JSC::Function, (intptr_t)static_cast<NativeFunction>(jsTestTypedefsPrototypeFunctionSetShadow), (intptr_t)3, NoIntrinsic },
    122120    { "methodWithSequenceArg", DontDelete | JSC::Function, (intptr_t)static_cast<NativeFunction>(jsTestTypedefsPrototypeFunctionMethodWithSequenceArg), (intptr_t)1, NoIntrinsic },
    … …  
    130128};
    131129
    132 static const HashTable JSTestTypedefsPrototypeTable = { 34, 31, JSTestTypedefsPrototypeTableValues, 0 };
     130static const HashTable JSTestTypedefsPrototypeTable = { 33, 31, JSTestTypedefsPrototypeTableValues, 0 };
    133131const ClassInfo JSTestTypedefsPrototype::s_info = { "TestTypedefsPrototype", &Base::s_info, &JSTestTypedefsPrototypeTable, 0, CREATE_METHOD_TABLE(JSTestTypedefsPrototype) };
    134132
    … …  
    378376        return JSValue::encode(jsUndefined());
    379377    impl->func(x);
    380     return JSValue::encode(jsUndefined());
    381 }
    382 
    383 EncodedJSValue JSC_HOST_CALL jsTestTypedefsPrototypeFunctionMultiTransferList(ExecState* exec)
    384 {
    385     JSValue thisValue = exec->hostThisValue();
    386     if (!thisValue.inherits(&JSTestTypedefs::s_info))
    387         return throwVMTypeError(exec);
    388     JSTestTypedefs* castedThis = jsCast<JSTestTypedefs*>(asObject(thisValue));
    389     ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestTypedefs::s_info);
    390     TestTypedefs* impl = static_cast<TestTypedefs*>(castedThis->impl());
    391     if (exec->argumentCount() < 1)
    392         return throwVMError(exec, createNotEnoughArgumentsError(exec));
    393     RefPtr<SerializedScriptValue> first(SerializedScriptValue::create(exec, exec->argument(0), 0, 0));
    394     if (exec->hadException())
    395         return JSValue::encode(jsUndefined());
    396 
    397     size_t argsCount = exec->argumentCount();
    398     if (argsCount <= 1) {
    399         impl->multiTransferList(first);
    400         return JSValue::encode(jsUndefined());
    401     }
    402 
    403     Int32Array* tx(toInt32Array(exec->argument(1)));
    404     if (exec->hadException())
    405         return JSValue::encode(jsUndefined());
    406     if (argsCount <= 2) {
    407         impl->multiTransferList(first, tx);
    408         return JSValue::encode(jsUndefined());
    409     }
    410 
    411     RefPtr<SerializedScriptValue> second(SerializedScriptValue::create(exec, exec->argument(2), 0, 0));
    412     if (exec->hadException())
    413         return JSValue::encode(jsUndefined());
    414     if (argsCount <= 3) {
    415         impl->multiTransferList(first, tx, second);
    416         return JSValue::encode(jsUndefined());
    417     }
    418 
    419     Int32Array* txx(toInt32Array(exec->argument(3)));
    420     if (exec->hadException())
    421         return JSValue::encode(jsUndefined());
    422     impl->multiTransferList(first, tx, second, txx);
    423378    return JSValue::encode(jsUndefined());
    424379}

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.h

    r148696 r149729  
    142142
    143143JSC::EncodedJSValue JSC_HOST_CALL jsTestTypedefsPrototypeFunctionFunc(JSC::ExecState*);
    144 JSC::EncodedJSValue JSC_HOST_CALL jsTestTypedefsPrototypeFunctionMultiTransferList(JSC::ExecState*);
    145144JSC::EncodedJSValue JSC_HOST_CALL jsTestTypedefsPrototypeFunctionSetShadow(JSC::ExecState*);
    146145JSC::EncodedJSValue JSC_HOST_CALL jsTestTypedefsPrototypeFunctionMethodWithSequenceArg(JSC::ExecState*);

  • trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestSerializedScriptValueInterface.h

    r149257 r149729  
    2929#if WEBKIT_VERSION_MAX_ALLOWED >= WEBKIT_VERSION_LATEST
    3030
    31 @class DOMInt32Array;
    3231@class DOMMessagePortArray;
    3332@class NSString;
    … …  
    3938@property(readonly, retain) DOMMessagePortArray *ports;
    4039@property(readonly, retain) NSString *cachedReadonlyValue;
    41 
    42 - (void)acceptTransferList:(NSString *)data transferList:(DOMInt32Array *)transferList;
    43 - (void)multiTransferList:(NSString *)first tx:(DOMInt32Array *)tx second:(NSString *)second txx:(DOMInt32Array *)txx;
    4440@end
    4541

  • trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestSerializedScriptValueInterface.mm

    r149257 r149729  
    3737#import "DOMCSSValueInternal.h"
    3838#import "DOMEventInternal.h"
    39 #import "DOMInt32ArrayInternal.h"
    4039#import "DOMMessagePortArrayInternal.h"
    4140#import "DOMNodeInternal.h"
    … …  
    4342#import "DOMTestSerializedScriptValueInterfaceInternal.h"
    4443#import "ExceptionHandlers.h"
    45 #import "Int32Array.h"
    4644#import "JSMainThreadExecState.h"
    4745#import "MessagePortArray.h"
    … …  
    120118}
    121119
    122 - (void)acceptTransferList:(NSString *)data transferList:(DOMInt32Array *)transferList
    123 {
    124     WebCore::JSMainThreadNullState state;
    125     IMPL->acceptTransferList(WebCore::SerializedScriptValue::create(WTF::String(data)), core(transferList));
    126 }
    127 
    128 - (void)multiTransferList:(NSString *)first tx:(DOMInt32Array *)tx second:(NSString *)second txx:(DOMInt32Array *)txx
    129 {
    130     WebCore::JSMainThreadNullState state;
    131     IMPL->multiTransferList(WebCore::SerializedScriptValue::create(WTF::String(first)), core(tx), WebCore::SerializedScriptValue::create(WTF::String(second)), core(txx));
    132 }
    133 
    134120@end
    135121

  • trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestTypedefs.h

    r149257 r149729  
    2929#if WEBKIT_VERSION_MAX_ALLOWED >= WEBKIT_VERSION_LATEST
    3030
    31 @class DOMInt32Array;
    3231@class DOMSVGPoint;
    3332@class NSString;
    … …  
    4140@property(copy) NSString *stringAttrWithSetterException;
    4241
    43 - (void)multiTransferList:(NSString *)first tx:(DOMInt32Array *)tx second:(NSString *)second txx:(DOMInt32Array *)txx;
    4442- (void)setShadow:(float)width height:(float)height blur:(float)blur color:(NSString *)color alpha:(float)alpha;
    4543- (DOMSVGPoint *)immutablePointFunction;

  • trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestTypedefs.mm

    r149257 r149729  
    3434#import "DOMCSSValueInternal.h"
    3535#import "DOMEventInternal.h"
    36 #import "DOMInt32ArrayInternal.h"
    3736#import "DOMNodeInternal.h"
    3837#import "DOMSVGPointInternal.h"
    … …  
    4039#import "DOMTestTypedefsInternal.h"
    4140#import "ExceptionHandlers.h"
    42 #import "Int32Array.h"
    4341#import "JSMainThreadExecState.h"
    4442#import "KURL.h"
    … …  
    155153}
    156154
    157 - (void)multiTransferList:(NSString *)first tx:(DOMInt32Array *)tx second:(NSString *)second txx:(DOMInt32Array *)txx
    158 {
    159     WebCore::JSMainThreadNullState state;
    160     IMPL->multiTransferList(WebCore::SerializedScriptValue::create(WTF::String(first)), core(tx), WebCore::SerializedScriptValue::create(WTF::String(second)), core(txx));
    161 }
    162 
    163155- (void)setShadow:(float)width height:(float)height blur:(float)blur color:(NSString *)color alpha:(float)alpha
    164156{

  • trunk/Source/WebCore/bindings/scripts/test/TestSerializedScriptValueInterface.idl

    r149368 r149729  
    2828[
    2929    Conditional=Condition1|Condition2,
    30     Constructor(DOMString hello, [TransferList=transferList] SerializedScriptValue data, [Default=Undefined] optional Int32Array transferList),
    3130] interface TestSerializedScriptValueInterface {
    3231    attribute SerializedScriptValue value;
    … …  
    3534    readonly attribute MessagePortArray ports;
    3635    [CachedAttribute] readonly attribute SerializedScriptValue cachedReadonlyValue;
    37     void acceptTransferList([TransferList=transferList] SerializedScriptValue data, optional Int32Array transferList);
    38     void multiTransferList([TransferList=tx] optional SerializedScriptValue first, optional Int32Array tx, [TransferList=txx] optional SerializedScriptValue second, optional Int32Array txx);
    3936};

  • trunk/Source/WebCore/bindings/scripts/test/TestTypedefs.idl

    r149368 r149729  
    4343    [StrictTypeChecking] void func(optional ARRAY_OF_LONGS x);
    4444
    45     void multiTransferList([TransferList=tx] SCRIPT_VALUE first, optional ARRAY tx, optional TRANSFER_TXX_SCRIPT_VALUE second, optional ARRAY txx);
    46 
    4745    void setShadow(DOUBLE width, DOUBLE height, float blur, [StrictTypeChecking] optional STRING color, optional DOUBLE alpha);
    4846
    … …  
    7876typedef Int32Array                 ARRAY;
    7977typedef DOMException               E;
    80 typedef [TransferList=txx] SerializedScriptValue TRANSFER_TXX_SCRIPT_VALUE;
Note: See TracChangeset for help on using the changeset viewer.