Get rid of [Callback] IDL extended attribute for parameters
authorch.dumez@sisa.samsung.com <ch.dumez@sisa.samsung.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 28 Apr 2013 09:38:28 +0000 (09:38 +0000)
committerch.dumez@sisa.samsung.com <ch.dumez@sisa.samsung.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 28 Apr 2013 09:38:28 +0000 (09:38 +0000)
https://bugs.webkit.org/show_bug.cgi?id=115250

Reviewed by Kentaro Hara.

Remove the WebKit-specific [Callback] extended attribute and make the bindings
generator smart enough to know when a parameter is of callback type on its
own.

No new tests, no behavior change.

* DerivedSources.make: Use WebCore/Modules as IDL include path instead of using
subdirs. The generator will search recursively anyway and the list of subdirs was
incomplete.
* Modules/filesystem/DOMWindowFileSystem.idl:
* Modules/filesystem/DirectoryEntry.idl:
* Modules/filesystem/DirectoryReader.idl:
* Modules/filesystem/Entry.idl:
* Modules/filesystem/FileEntry.idl:
* Modules/filesystem/WorkerContextFileSystem.idl:
* Modules/mediastream/NavigatorMediaStream.idl:
* Modules/mediastream/RTCPeerConnection.idl:
* Modules/notifications/Notification.idl:
* Modules/notifications/NotificationCenter.idl:
* Modules/quota/StorageInfo.idl:
* Modules/quota/StorageQuota.idl:
* Modules/webaudio/AudioContext.idl:
* Modules/webdatabase/DOMWindowWebDatabase.idl:
* Modules/webdatabase/Database.idl:
* Modules/webdatabase/DatabaseSync.idl:
* Modules/webdatabase/SQLTransaction.idl:
* Modules/webdatabase/WorkerContextWebDatabase.idl:
* bindings/gobject/GNUmakefile.am: Add missing IDL include dirs.
* bindings/scripts/CodeGenerator.pm:
(IsWrapperType):
(IsCallbackInterface):
* bindings/scripts/CodeGeneratorGObject.pm:
(SkipFunction):
* bindings/scripts/CodeGeneratorJS.pm:
(GenerateParametersCheckExpression):
(GenerateParametersCheck):
* bindings/scripts/IDLAttributes.txt: Remove "Callback" extended attribute.
* bindings/scripts/test/CPP/WebDOMTestCallback.cpp:
(WebDOMTestCallback::callbackWithArrayParam):
(WebDOMTestCallback::callbackWithSerializedScriptValueParam):
(WebDOMTestCallback::callbackWithNonBoolReturnType):
(WebDOMTestCallback::callbackRequiresThisToPass):
* bindings/scripts/test/CPP/WebDOMTestCallback.h:
(WebDOMTestCallback):
* bindings/scripts/test/CPP/WebDOMTestObj.cpp:
(WebDOMTestObj::convert1):
(WebDOMTestObj::convert2):
(WebDOMTestObj::convert4):
(WebDOMTestObj::convert5):
* bindings/scripts/test/CPP/WebDOMTestObj.h:
* bindings/scripts/test/CPP/WebDOMTestSerializedScriptValueInterface.cpp:
(WebDOMTestSerializedScriptValueInterface::acceptTransferList):
(WebDOMTestSerializedScriptValueInterface::multiTransferList):
* bindings/scripts/test/CPP/WebDOMTestSerializedScriptValueInterface.h:
(WebDOMTestSerializedScriptValueInterface):
* bindings/scripts/test/CPP/WebDOMTestTypedefs.cpp:
(WebDOMTestTypedefs::multiTransferList):
* bindings/scripts/test/CPP/WebDOMTestTypedefs.h:
(WebDOMTestTypedefs):
* bindings/scripts/test/GObject/WebKitDOMTestCallback.cpp:
(webkit_dom_test_callback_callback_with_array_param):
(webkit_dom_test_callback_callback_with_serialized_script_value_param):
(webkit_dom_test_callback_callback_with_non_bool_return_type):
(webkit_dom_test_callback_callback_requires_this_to_pass):
* bindings/scripts/test/GObject/WebKitDOMTestCallback.h:
* bindings/scripts/test/GObject/WebKitDOMTestObj.cpp:
(webkit_dom_test_obj_convert1):
(webkit_dom_test_obj_convert2):
(webkit_dom_test_obj_convert4):
(webkit_dom_test_obj_convert5):
* bindings/scripts/test/GObject/WebKitDOMTestObj.h:
* bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterface.cpp:
(webkit_dom_test_serialized_script_value_interface_accept_transfer_list):
(webkit_dom_test_serialized_script_value_interface_multi_transfer_list):
* bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterface.h:
* bindings/scripts/test/GObject/WebKitDOMTestTypedefs.cpp:
(webkit_dom_test_typedefs_multi_transfer_list):
* bindings/scripts/test/GObject/WebKitDOMTestTypedefs.h:
* bindings/scripts/test/JS/JSTestCallback.cpp:
(WebCore::JSTestCallback::callbackWithArrayParam):
(WebCore::JSTestCallback::callbackWithSerializedScriptValueParam):
(WebCore::JSTestCallback::callbackRequiresThisToPass):
* bindings/scripts/test/JS/JSTestCallback.h:
(JSTestCallback):
* bindings/scripts/test/JS/JSTestObj.cpp:
(WebCore::jsTestObjPrototypeFunctionConvert1):
(WebCore::jsTestObjPrototypeFunctionConvert2):
(WebCore::jsTestObjPrototypeFunctionConvert4):
(WebCore::jsTestObjPrototypeFunctionConvert5):
* bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.cpp:
(WebCore::JSTestSerializedScriptValueInterfaceConstructor::constructJSTestSerializedScriptValueInterface):
(WebCore::jsTestSerializedScriptValueInterfacePrototypeFunctionAcceptTransferList):
(WebCore::jsTestSerializedScriptValueInterfacePrototypeFunctionMultiTransferList):
* bindings/scripts/test/JS/JSTestTypedefs.cpp:
(WebCore::jsTestTypedefsPrototypeFunctionMultiTransferList):
* bindings/scripts/test/ObjC/DOMTestCallback.h:
* bindings/scripts/test/ObjC/DOMTestCallback.mm:
(-[DOMTestCallback callbackWithArrayParam:]):
(-[DOMTestCallback callbackWithSerializedScriptValueParam:strArg:]):
(-[DOMTestCallback callbackWithNonBoolReturnType:]):
(-[DOMTestCallback callbackRequiresThisToPass:testNodeParam:]):
* bindings/scripts/test/ObjC/DOMTestObj.h:
* bindings/scripts/test/ObjC/DOMTestObj.mm:
(-[DOMTestObj convert1:]):
(-[DOMTestObj convert2:]):
(-[DOMTestObj convert4:]):
(-[DOMTestObj convert5:]):
* bindings/scripts/test/ObjC/DOMTestSerializedScriptValueInterface.h:
* bindings/scripts/test/ObjC/DOMTestSerializedScriptValueInterface.mm:
(-[DOMTestSerializedScriptValueInterface acceptTransferList:transferList:]):
(-[DOMTestSerializedScriptValueInterface multiTransferList:tx:second:txx:]):
* bindings/scripts/test/ObjC/DOMTestTypedefs.h:
* bindings/scripts/test/ObjC/DOMTestTypedefs.mm:
(-[DOMTestTypedefs multiTransferList:tx:second:txx:]):
* bindings/scripts/test/TestCallback.idl: Use valid types instead of Class1, Class2, ...
so that the bindings generator does not complain about not being able to resolve
them.
* bindings/scripts/test/TestObj.idl: Use valid parameter types instead of 'a', 'b', 'd', 'e'
so that the bindings generator does not complain about them.
* bindings/scripts/test/TestSerializedScriptValueInterface.idl:
* bindings/scripts/test/TestTypedefs.idl:
* css/FontLoader.idl:
* dom/DataTransferItem.idl:
* page/DOMWindow.idl:

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

61 files changed:
Source/WebCore/ChangeLog
Source/WebCore/DerivedSources.make
Source/WebCore/Modules/filesystem/DOMWindowFileSystem.idl
Source/WebCore/Modules/filesystem/DirectoryEntry.idl
Source/WebCore/Modules/filesystem/DirectoryReader.idl
Source/WebCore/Modules/filesystem/Entry.idl
Source/WebCore/Modules/filesystem/FileEntry.idl
Source/WebCore/Modules/filesystem/WorkerContextFileSystem.idl
Source/WebCore/Modules/mediastream/NavigatorMediaStream.idl
Source/WebCore/Modules/mediastream/RTCPeerConnection.idl
Source/WebCore/Modules/notifications/Notification.idl
Source/WebCore/Modules/notifications/NotificationCenter.idl
Source/WebCore/Modules/quota/StorageInfo.idl
Source/WebCore/Modules/quota/StorageQuota.idl
Source/WebCore/Modules/webaudio/AudioContext.idl
Source/WebCore/Modules/webdatabase/DOMWindowWebDatabase.idl
Source/WebCore/Modules/webdatabase/Database.idl
Source/WebCore/Modules/webdatabase/DatabaseSync.idl
Source/WebCore/Modules/webdatabase/SQLTransaction.idl
Source/WebCore/Modules/webdatabase/WorkerContextWebDatabase.idl
Source/WebCore/bindings/gobject/GNUmakefile.am
Source/WebCore/bindings/scripts/CodeGenerator.pm
Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm
Source/WebCore/bindings/scripts/CodeGeneratorJS.pm
Source/WebCore/bindings/scripts/IDLAttributes.txt
Source/WebCore/bindings/scripts/test/CPP/WebDOMTestCallback.cpp
Source/WebCore/bindings/scripts/test/CPP/WebDOMTestCallback.h
Source/WebCore/bindings/scripts/test/CPP/WebDOMTestObj.cpp
Source/WebCore/bindings/scripts/test/CPP/WebDOMTestObj.h
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/WebKitDOMTestCallback.cpp
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCallback.h
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.cpp
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.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/JSTestCallback.cpp
Source/WebCore/bindings/scripts/test/JS/JSTestCallback.h
Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp
Source/WebCore/bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.cpp
Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.cpp
Source/WebCore/bindings/scripts/test/ObjC/DOMTestCallback.h
Source/WebCore/bindings/scripts/test/ObjC/DOMTestCallback.mm
Source/WebCore/bindings/scripts/test/ObjC/DOMTestObj.h
Source/WebCore/bindings/scripts/test/ObjC/DOMTestObj.mm
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/TestCallback.idl
Source/WebCore/bindings/scripts/test/TestObj.idl
Source/WebCore/bindings/scripts/test/TestSerializedScriptValueInterface.idl
Source/WebCore/bindings/scripts/test/TestTypedefs.idl
Source/WebCore/css/FontLoader.idl
Source/WebCore/dom/DataTransferItem.idl
Source/WebCore/page/DOMWindow.idl

index 65a46c0..d511fed 100644 (file)
@@ -1,3 +1,135 @@
+2013-04-28  Christophe Dumez  <ch.dumez@sisa.samsung.com>
+
+        Get rid of [Callback] IDL extended attribute for parameters
+        https://bugs.webkit.org/show_bug.cgi?id=115250
+
+        Reviewed by Kentaro Hara.
+
+        Remove the WebKit-specific [Callback] extended attribute and make the bindings
+        generator smart enough to know when a parameter is of callback type on its
+        own.
+
+        No new tests, no behavior change.
+
+        * DerivedSources.make: Use WebCore/Modules as IDL include path instead of using
+        subdirs. The generator will search recursively anyway and the list of subdirs was
+        incomplete.
+        * Modules/filesystem/DOMWindowFileSystem.idl:
+        * Modules/filesystem/DirectoryEntry.idl:
+        * Modules/filesystem/DirectoryReader.idl:
+        * Modules/filesystem/Entry.idl:
+        * Modules/filesystem/FileEntry.idl:
+        * Modules/filesystem/WorkerContextFileSystem.idl:
+        * Modules/mediastream/NavigatorMediaStream.idl:
+        * Modules/mediastream/RTCPeerConnection.idl:
+        * Modules/notifications/Notification.idl:
+        * Modules/notifications/NotificationCenter.idl:
+        * Modules/quota/StorageInfo.idl:
+        * Modules/quota/StorageQuota.idl:
+        * Modules/webaudio/AudioContext.idl:
+        * Modules/webdatabase/DOMWindowWebDatabase.idl:
+        * Modules/webdatabase/Database.idl:
+        * Modules/webdatabase/DatabaseSync.idl:
+        * Modules/webdatabase/SQLTransaction.idl:
+        * Modules/webdatabase/WorkerContextWebDatabase.idl:
+        * bindings/gobject/GNUmakefile.am: Add missing IDL include dirs.
+        * bindings/scripts/CodeGenerator.pm:
+        (IsWrapperType):
+        (IsCallbackInterface):
+        * bindings/scripts/CodeGeneratorGObject.pm:
+        (SkipFunction):
+        * bindings/scripts/CodeGeneratorJS.pm:
+        (GenerateParametersCheckExpression):
+        (GenerateParametersCheck):
+        * bindings/scripts/IDLAttributes.txt: Remove "Callback" extended attribute.
+        * bindings/scripts/test/CPP/WebDOMTestCallback.cpp:
+        (WebDOMTestCallback::callbackWithArrayParam):
+        (WebDOMTestCallback::callbackWithSerializedScriptValueParam):
+        (WebDOMTestCallback::callbackWithNonBoolReturnType):
+        (WebDOMTestCallback::callbackRequiresThisToPass):
+        * bindings/scripts/test/CPP/WebDOMTestCallback.h:
+        (WebDOMTestCallback):
+        * bindings/scripts/test/CPP/WebDOMTestObj.cpp:
+        (WebDOMTestObj::convert1):
+        (WebDOMTestObj::convert2):
+        (WebDOMTestObj::convert4):
+        (WebDOMTestObj::convert5):
+        * bindings/scripts/test/CPP/WebDOMTestObj.h:
+        * bindings/scripts/test/CPP/WebDOMTestSerializedScriptValueInterface.cpp:
+        (WebDOMTestSerializedScriptValueInterface::acceptTransferList):
+        (WebDOMTestSerializedScriptValueInterface::multiTransferList):
+        * bindings/scripts/test/CPP/WebDOMTestSerializedScriptValueInterface.h:
+        (WebDOMTestSerializedScriptValueInterface):
+        * bindings/scripts/test/CPP/WebDOMTestTypedefs.cpp:
+        (WebDOMTestTypedefs::multiTransferList):
+        * bindings/scripts/test/CPP/WebDOMTestTypedefs.h:
+        (WebDOMTestTypedefs):
+        * bindings/scripts/test/GObject/WebKitDOMTestCallback.cpp:
+        (webkit_dom_test_callback_callback_with_array_param):
+        (webkit_dom_test_callback_callback_with_serialized_script_value_param):
+        (webkit_dom_test_callback_callback_with_non_bool_return_type):
+        (webkit_dom_test_callback_callback_requires_this_to_pass):
+        * bindings/scripts/test/GObject/WebKitDOMTestCallback.h:
+        * bindings/scripts/test/GObject/WebKitDOMTestObj.cpp:
+        (webkit_dom_test_obj_convert1):
+        (webkit_dom_test_obj_convert2):
+        (webkit_dom_test_obj_convert4):
+        (webkit_dom_test_obj_convert5):
+        * bindings/scripts/test/GObject/WebKitDOMTestObj.h:
+        * bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterface.cpp:
+        (webkit_dom_test_serialized_script_value_interface_accept_transfer_list):
+        (webkit_dom_test_serialized_script_value_interface_multi_transfer_list):
+        * bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterface.h:
+        * bindings/scripts/test/GObject/WebKitDOMTestTypedefs.cpp:
+        (webkit_dom_test_typedefs_multi_transfer_list):
+        * bindings/scripts/test/GObject/WebKitDOMTestTypedefs.h:
+        * bindings/scripts/test/JS/JSTestCallback.cpp:
+        (WebCore::JSTestCallback::callbackWithArrayParam):
+        (WebCore::JSTestCallback::callbackWithSerializedScriptValueParam):
+        (WebCore::JSTestCallback::callbackRequiresThisToPass):
+        * bindings/scripts/test/JS/JSTestCallback.h:
+        (JSTestCallback):
+        * bindings/scripts/test/JS/JSTestObj.cpp:
+        (WebCore::jsTestObjPrototypeFunctionConvert1):
+        (WebCore::jsTestObjPrototypeFunctionConvert2):
+        (WebCore::jsTestObjPrototypeFunctionConvert4):
+        (WebCore::jsTestObjPrototypeFunctionConvert5):
+        * bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.cpp:
+        (WebCore::JSTestSerializedScriptValueInterfaceConstructor::constructJSTestSerializedScriptValueInterface):
+        (WebCore::jsTestSerializedScriptValueInterfacePrototypeFunctionAcceptTransferList):
+        (WebCore::jsTestSerializedScriptValueInterfacePrototypeFunctionMultiTransferList):
+        * bindings/scripts/test/JS/JSTestTypedefs.cpp:
+        (WebCore::jsTestTypedefsPrototypeFunctionMultiTransferList):
+        * bindings/scripts/test/ObjC/DOMTestCallback.h:
+        * bindings/scripts/test/ObjC/DOMTestCallback.mm:
+        (-[DOMTestCallback callbackWithArrayParam:]):
+        (-[DOMTestCallback callbackWithSerializedScriptValueParam:strArg:]):
+        (-[DOMTestCallback callbackWithNonBoolReturnType:]):
+        (-[DOMTestCallback callbackRequiresThisToPass:testNodeParam:]):
+        * bindings/scripts/test/ObjC/DOMTestObj.h:
+        * bindings/scripts/test/ObjC/DOMTestObj.mm:
+        (-[DOMTestObj convert1:]):
+        (-[DOMTestObj convert2:]):
+        (-[DOMTestObj convert4:]):
+        (-[DOMTestObj convert5:]):
+        * bindings/scripts/test/ObjC/DOMTestSerializedScriptValueInterface.h:
+        * bindings/scripts/test/ObjC/DOMTestSerializedScriptValueInterface.mm:
+        (-[DOMTestSerializedScriptValueInterface acceptTransferList:transferList:]):
+        (-[DOMTestSerializedScriptValueInterface multiTransferList:tx:second:txx:]):
+        * bindings/scripts/test/ObjC/DOMTestTypedefs.h:
+        * bindings/scripts/test/ObjC/DOMTestTypedefs.mm:
+        (-[DOMTestTypedefs multiTransferList:tx:second:txx:]):
+        * bindings/scripts/test/TestCallback.idl: Use valid types instead of Class1, Class2, ...
+        so that the bindings generator does not complain about not being able to resolve
+        them.
+        * bindings/scripts/test/TestObj.idl: Use valid parameter types instead of 'a', 'b', 'd', 'e'
+        so that the bindings generator does not complain about them.
+        * bindings/scripts/test/TestSerializedScriptValueInterface.idl:
+        * bindings/scripts/test/TestTypedefs.idl:
+        * css/FontLoader.idl:
+        * dom/DataTransferItem.idl:
+        * page/DOMWindow.idl:
+
 2013-04-27  Darin Adler  <darin@apple.com>
 
         Move from constructor and member function adoptCF/NS to free function adoptCF/NS.
index 7df7a32..747d5c3 100644 (file)
@@ -970,21 +970,7 @@ preprocess_idls_script = perl $(addprefix -I $(WebCore)/, $(sort $(dir $(1)))) $
 # JS bindings generator
 
 IDL_INCLUDES = \
-    $(WebCore)/Modules/battery \
-       $(WebCore)/Modules/encryptedmedia \
-    $(WebCore)/Modules/filesystem \
-    $(WebCore)/Modules/gamepad \
-    $(WebCore)/Modules/geolocation \
-    $(WebCore)/Modules/indexeddb \
-    $(WebCore)/Modules/mediasource \
-    $(WebCore)/Modules/mediastream \
-    $(WebCore)/Modules/networkinfo \
-    $(WebCore)/Modules/notifications \
-    $(WebCore)/Modules/speech \
-    $(WebCore)/Modules/vibration \
-    $(WebCore)/Modules/webaudio \
-    $(WebCore)/Modules/webdatabase \
-    $(WebCore)/Modules/websockets \
+    $(WebCore)/Modules \
     $(WebCore)/css \
     $(WebCore)/dom \
     $(WebCore)/fileapi \
index f9f2554..56f5811 100644 (file)
@@ -31,8 +31,8 @@
     const unsigned short PERSISTENT = 1;
 
     void webkitRequestFileSystem(in unsigned short type, in long long size,
-            in [Callback] FileSystemCallback successCallback, in [Callback, Optional] ErrorCallback errorCallback);
+            in FileSystemCallback successCallback, in [Optional] ErrorCallback errorCallback);
     void webkitResolveLocalFileSystemURL(in DOMString url,
-            in [Callback] EntryCallback successCallback, in [Callback, Optional] ErrorCallback errorCallback);
+            in EntryCallback successCallback, in [Optional] ErrorCallback errorCallback);
 };
 
index 63b427a..fb04203 100644 (file)
@@ -35,7 +35,7 @@
     JSNoStaticTables
 ] interface DirectoryEntry : Entry {
     DirectoryReader createReader();
-    void getFile(in [TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString path, in [Optional] Dictionary options, in [Optional, Callback] EntryCallback successCallback, in [Optional, Callback] ErrorCallback errorCallback);
-    void getDirectory(in [TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString path, in [Optional] Dictionary options, in [Optional, Callback] EntryCallback successCallback, in [Optional, Callback] ErrorCallback errorCallback);
-    void removeRecursively(in [Callback] VoidCallback successCallback, in [Optional, Callback] ErrorCallback errorCallback);
+    void getFile(in [TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString path, in [Optional] Dictionary options, in [Optional] EntryCallback successCallback, in [Optional] ErrorCallback errorCallback);
+    void getDirectory(in [TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString path, in [Optional] Dictionary options, in [Optional] EntryCallback successCallback, in [Optional] ErrorCallback errorCallback);
+    void removeRecursively(in VoidCallback successCallback, in [Optional] ErrorCallback errorCallback);
 };
index e0467a9..0852b14 100644 (file)
@@ -33,5 +33,5 @@
     JSNoStaticTables,
     ImplementationLacksVTable
 ] interface DirectoryReader {
-    void readEntries(in [Callback] EntriesCallback successCallback, in [Optional, Callback] ErrorCallback errorCallback);
+    void readEntries(in EntriesCallback successCallback, in [Optional] ErrorCallback errorCallback);
 };
index c43def4..9251421 100644 (file)
     readonly attribute DOMString fullPath;
     readonly attribute DOMFileSystem filesystem;
 
-    void getMetadata(in [Callback] MetadataCallback successCallback, in [Optional, Callback] ErrorCallback errorCallback);
-    void moveTo(in DirectoryEntry parent, in [Optional, TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString name, in [Optional, Callback] EntryCallback successCallback, in [Optional, Callback] ErrorCallback errorCallback);
-    void copyTo(in DirectoryEntry parent, in [Optional, TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString name, in [Optional, Callback] EntryCallback successCallback, in [Optional, Callback] ErrorCallback errorCallback);
+    void getMetadata(in MetadataCallback successCallback, in [Optional] ErrorCallback errorCallback);
+    void moveTo(in DirectoryEntry parent, in [Optional, TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString name, in [Optional] EntryCallback successCallback, in [Optional] ErrorCallback errorCallback);
+    void copyTo(in DirectoryEntry parent, in [Optional, TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString name, in [Optional] EntryCallback successCallback, in [Optional] ErrorCallback errorCallback);
     DOMString toURL();
-    void remove(in [Callback] VoidCallback successCallback, in [Optional, Callback] ErrorCallback errorCallback);
-    void getParent(in [Optional, Callback] EntryCallback successCallback, in [Optional, Callback] ErrorCallback errorCallback);
+    void remove(in VoidCallback successCallback, in [Optional] ErrorCallback errorCallback);
+    void getParent(in [Optional] EntryCallback successCallback, in [Optional] ErrorCallback errorCallback);
 };
index 9bad551..8ccb4c6 100644 (file)
@@ -34,6 +34,6 @@
     JSGenerateToJSObject,
     JSNoStaticTables
 ] interface FileEntry : Entry {
-    void createWriter(in [Callback] FileWriterCallback successCallback, in [Optional, Callback] ErrorCallback errorCallback);
-    void file(in [Callback] FileCallback successCallback, in [Optional, Callback] ErrorCallback errorCallback);
+    void createWriter(in FileWriterCallback successCallback, in [Optional] ErrorCallback errorCallback);
+    void file(in FileCallback successCallback, in [Optional] ErrorCallback errorCallback);
 };
index 90cf6a9..486d800 100644 (file)
@@ -30,9 +30,9 @@
     const unsigned short TEMPORARY = 0;
     const unsigned short PERSISTENT = 1;
 
-    void webkitRequestFileSystem(in unsigned short type, in long long size, in [Callback, Optional] FileSystemCallback successCallback, in [Callback, Optional] ErrorCallback errorCallback);
+    void webkitRequestFileSystem(in unsigned short type, in long long size, in [Optional] FileSystemCallback successCallback, in [Optional] ErrorCallback errorCallback);
     DOMFileSystemSync webkitRequestFileSystemSync(in unsigned short type, in long long size) raises (FileException);
-    void webkitResolveLocalFileSystemURL(in DOMString url, in [Callback] EntryCallback successCallback, in [Callback, Optional] ErrorCallback errorCallback);
+    void webkitResolveLocalFileSystemURL(in DOMString url, in EntryCallback successCallback, in [Optional] ErrorCallback errorCallback);
     EntrySync webkitResolveLocalFileSystemSyncURL(in DOMString url) raises (FileException);
 
     attribute FileErrorConstructor FileError;
index 5d399a8..d1691cb 100644 (file)
@@ -21,8 +21,8 @@
     Conditional=MEDIA_STREAM,
 ] partial interface Navigator {
     void webkitGetUserMedia(in Dictionary options,
-                                                 in [Callback] NavigatorUserMediaSuccessCallback successCallback,
-                                                 in [Callback, Optional] NavigatorUserMediaErrorCallback errorCallback)
+                                                 in NavigatorUserMediaSuccessCallback successCallback,
+                                                 in [Optional] NavigatorUserMediaErrorCallback errorCallback)
         raises(DOMException);
 };
 
index a0dc1ce..6dd1691 100644 (file)
     CallWith=ScriptExecutionContext,
     EventTarget
 ] interface RTCPeerConnection {
-    void createOffer(in [Callback] RTCSessionDescriptionCallback successCallback, in [Callback,Optional=DefaultIsUndefined] RTCErrorCallback failureCallback, in [Optional] Dictionary mediaConstraints)
+    void createOffer(in RTCSessionDescriptionCallback successCallback, in [Optional=DefaultIsUndefined] RTCErrorCallback failureCallback, in [Optional] Dictionary mediaConstraints)
         raises(DOMException);
 
-    void createAnswer(in [Callback] RTCSessionDescriptionCallback successCallback, in [Callback, Optional=DefaultIsUndefined] RTCErrorCallback failureCallback, in [Optional] Dictionary mediaConstraints)
+    void createAnswer(in RTCSessionDescriptionCallback successCallback, in [Optional=DefaultIsUndefined] RTCErrorCallback failureCallback, in [Optional] Dictionary mediaConstraints)
         raises(DOMException);
 
-    void setLocalDescription(in RTCSessionDescription description, in [Callback, Optional=DefaultIsUndefined] VoidCallback successCallback, in [Callback, Optional=DefaultIsUndefined] RTCErrorCallback failureCallback)
+    void setLocalDescription(in RTCSessionDescription description, in [Optional=DefaultIsUndefined] VoidCallback successCallback, in [Optional=DefaultIsUndefined] RTCErrorCallback failureCallback)
         raises(DOMException);
     readonly attribute RTCSessionDescription localDescription
         getter raises(DOMException);
 
-    void setRemoteDescription(in RTCSessionDescription description, in [Callback, Optional=DefaultIsUndefined] VoidCallback successCallback, in [Callback, Optional=DefaultIsUndefined] RTCErrorCallback failureCallback)
+    void setRemoteDescription(in RTCSessionDescription description, in [Optional=DefaultIsUndefined] VoidCallback successCallback, in [Optional=DefaultIsUndefined] RTCErrorCallback failureCallback)
         raises(DOMException);
     readonly attribute RTCSessionDescription remoteDescription
         getter raises(DOMException);
@@ -72,7 +72,7 @@
     [StrictTypeChecking] void removeStream(in MediaStream stream)
         raises(DOMException);
 
-    void getStats(in [Callback] RTCStatsCallback successCallback, in [Optional=DefaultIsUndefined] MediaStreamTrack selector);
+    void getStats(in RTCStatsCallback successCallback, in [Optional=DefaultIsUndefined] MediaStreamTrack selector);
 
     RTCDataChannel createDataChannel(in [TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString label, in [Optional] Dictionary options)
          raises(DOMException);
index 194e89b..38708a7 100644 (file)
@@ -51,7 +51,7 @@
 
 #if defined(ENABLE_NOTIFICATIONS) && ENABLE_NOTIFICATIONS
     static readonly attribute [CallWith=ScriptExecutionContext] DOMString permission;
-    [CallWith=ScriptExecutionContext] static void requestPermission(in [Optional, Callback] NotificationPermissionCallback callback);
+    [CallWith=ScriptExecutionContext] static void requestPermission(in [Optional] NotificationPermissionCallback callback);
 #endif
 
     attribute EventListener onshow;
index ae1a558..2a7d38c 100644 (file)
@@ -37,6 +37,6 @@
    Notification createNotification(in DOMString iconUrl, in DOMString title, in DOMString body) raises(DOMException);
 
    int checkPermission();
-   void requestPermission(in [Optional, Callback] VoidCallback callback);
+   void requestPermission(in [Optional] VoidCallback callback);
 };
 
index 38f7b93..b69d3c1 100644 (file)
@@ -31,6 +31,6 @@
     const unsigned short TEMPORARY = 0;
     const unsigned short PERSISTENT = 1;
 
-    [CallWith=ScriptExecutionContext] void queryUsageAndQuota(in unsigned short storageType, in [Callback, Optional] StorageUsageCallback usageCallback, in [Callback, Optional] StorageErrorCallback errorCallback);
-    [CallWith=ScriptExecutionContext] void requestQuota(in unsigned short storageType, in unsigned long long newQuotaInBytes, in [Callback, Optional] StorageQuotaCallback quotaCallback, in [Callback, Optional] StorageErrorCallback errorCallback);
+    [CallWith=ScriptExecutionContext] void queryUsageAndQuota(in unsigned short storageType, in [Optional] StorageUsageCallback usageCallback, in [Optional] StorageErrorCallback errorCallback);
+    [CallWith=ScriptExecutionContext] void requestQuota(in unsigned short storageType, in unsigned long long newQuotaInBytes, in [Optional] StorageQuotaCallback quotaCallback, in [Optional] StorageErrorCallback errorCallback);
 };
index 4364f5b..4a64f9e 100644 (file)
@@ -28,6 +28,6 @@
     OmitConstructor,
     ImplementationLacksVTable
 ] interface StorageQuota {
-    [CallWith=ScriptExecutionContext] void queryUsageAndQuota(in [Callback] StorageUsageCallback usageCallback, in [Callback, Optional] StorageErrorCallback errorCallback);
-    [CallWith=ScriptExecutionContext] void requestQuota(in unsigned long long newQuotaInBytes, in [Callback, Optional] StorageQuotaCallback quotaCallback, in [Callback, Optional] StorageErrorCallback errorCallback);
+    [CallWith=ScriptExecutionContext] void queryUsageAndQuota(in StorageUsageCallback usageCallback, in [Optional] StorageErrorCallback errorCallback);
+    [CallWith=ScriptExecutionContext] void requestQuota(in unsigned long long newQuotaInBytes, in [Optional] StorageQuotaCallback quotaCallback, in [Optional] StorageErrorCallback errorCallback);
 };
index 4f19b48..741a59e 100644 (file)
@@ -51,7 +51,7 @@
         raises(DOMException);
 
     // Asynchronous audio file data decoding.
-    void decodeAudioData(in ArrayBuffer audioData, in [Callback] AudioBufferCallback successCallback, in [Optional, Callback] AudioBufferCallback errorCallback)
+    void decodeAudioData(in ArrayBuffer audioData, in AudioBufferCallback successCallback, in [Optional] AudioBufferCallback errorCallback)
         raises(DOMException);
 
     // Sources
index 1f31e1d..0745a13 100644 (file)
@@ -27,7 +27,7 @@
 [
     Conditional=SQL_DATABASE,
 ] partial interface DOMWindow {
-    Database openDatabase(in DOMString name, in DOMString version, in DOMString displayName, in unsigned long estimatedSize, in [Callback, Optional] DatabaseCallback creationCallback)
+    Database openDatabase(in DOMString name, in DOMString version, in DOMString displayName, in unsigned long estimatedSize, in [Optional] DatabaseCallback creationCallback)
         raises(DOMException);
 #if !defined(LANGUAGE_CPP) || !LANGUAGE_CPP
     attribute SQLExceptionConstructor SQLException;
index 5f64897..3efe393 100644 (file)
@@ -32,8 +32,8 @@
     JSNoStaticTables
 ] interface Database {
     readonly attribute DOMString version;
-    void changeVersion(in DOMString oldVersion, in DOMString newVersion, in [Callback, Optional] SQLTransactionCallback callback, in [Callback, Optional] SQLTransactionErrorCallback errorCallback, in [Callback, Optional] VoidCallback successCallback);
-    void transaction(in [Callback] SQLTransactionCallback callback, in [Callback, Optional] SQLTransactionErrorCallback errorCallback, in [Callback, Optional] VoidCallback successCallback);
-    void readTransaction(in [Callback] SQLTransactionCallback callback, in [Callback, Optional] SQLTransactionErrorCallback errorCallback, in [Callback, Optional] VoidCallback successCallback);
+    void changeVersion(in DOMString oldVersion, in DOMString newVersion, in [Optional] SQLTransactionCallback callback, in [Optional] SQLTransactionErrorCallback errorCallback, in [Optional] VoidCallback successCallback);
+    void transaction(in SQLTransactionCallback callback, in [Optional] SQLTransactionErrorCallback errorCallback, in [Optional] VoidCallback successCallback);
+    void readTransaction(in SQLTransactionCallback callback, in [Optional] SQLTransactionErrorCallback errorCallback, in [Optional] VoidCallback successCallback);
 };
 
index 1301eab..3b4fec7 100644 (file)
@@ -35,8 +35,8 @@
 ] interface DatabaseSync {
     readonly attribute DOMString version;
     readonly attribute DOMString lastErrorMessage;
-    void changeVersion(in DOMString oldVersion, in DOMString newVersion, in [Callback, Optional] SQLTransactionSyncCallback callback) raises(DOMException);
-    void transaction(in [Callback] SQLTransactionSyncCallback callback) raises(DOMException);
-    void readTransaction(in [Callback] SQLTransactionSyncCallback callback) raises(DOMException);
+    void changeVersion(in DOMString oldVersion, in DOMString newVersion, in [Optional] SQLTransactionSyncCallback callback) raises(DOMException);
+    void transaction(in SQLTransactionSyncCallback callback) raises(DOMException);
+    void readTransaction(in SQLTransactionSyncCallback callback) raises(DOMException);
 };
 
index a57df16..53a9311 100644 (file)
@@ -34,6 +34,6 @@
 ] interface SQLTransaction {
     [Custom] void executeSql(in DOMString sqlStatement,
                              in ObjectArray arguments,
-                             in [Optional, Callback] SQLStatementCallback callback,
-                             in [Optional, Callback] SQLStatementErrorCallback errorCallback);
+                             in [Optional] SQLStatementCallback callback,
+                             in [Optional] SQLStatementErrorCallback errorCallback);
 };
index 5a1e5e9..d8b9dc5 100644 (file)
 [
     Conditional=SQL_DATABASE,
 ] partial interface WorkerContext {
-    Database openDatabase(in DOMString name, in DOMString version, in DOMString displayName, in unsigned long estimatedSize, in [Callback, Optional] DatabaseCallback creationCallback)
+    Database openDatabase(in DOMString name, in DOMString version, in DOMString displayName, in unsigned long estimatedSize, in [Optional] DatabaseCallback creationCallback)
         raises(DOMException);
 
-    DatabaseSync openDatabaseSync(in DOMString name, in DOMString version, in DOMString displayName, in unsigned long estimatedSize, in [Callback, Optional] DatabaseCallback creationCallback)
+    DatabaseSync openDatabaseSync(in DOMString name, in DOMString version, in DOMString displayName, in unsigned long estimatedSize, in [Optional] DatabaseCallback creationCallback)
         raises(DOMException);
 };
 
index eeeeeba..be61c50 100644 (file)
@@ -497,7 +497,7 @@ $(top_builddir)/DerivedSources/webkitdom/WebKitDOMCustom.h: $(WebCore)/bindings/
 # Filter out SVG and IndexedDB for now
 gdom_feature_defines := $(filter-out ENABLE_INDEXED_DATABASE=1, $(filter-out ENABLE_SVG%, $(feature_defines))) ENABLE_INDEXED_DATABASE=0
 DerivedSources/webkitdom/WebKitDOM%.cpp DerivedSources/webkitdom/WebKitDOM%.h DerivedSources/webkitdom/WebKitDOM%Private.h: %.idl $(SCRIPTS_FOR_GENERATE_BINDINGS) $(WebCore)/bindings/scripts/CodeGeneratorGObject.pm $(WebCore)/bindings/gobject/GNUmakefile.am $(supplemental_dependency_file)
-       $(AM_V_GEN)$(PERL) -I$(WebCore)/bindings/scripts $(WebCore)/bindings/scripts/generate-bindings.pl --include $(WebCore)/dom --include $(WebCore)/html --include $(WebCore)/css --include $(WebCore)/page --include $(WebCore)/xml --include $(WebCore)/svg --outputDir "$(GENSOURCES_WEBKITDOM)" --defines "LANGUAGE_GOBJECT=1 $(gdom_feature_defines)" --generator GObject --supplementalDependencyFile $(supplemental_dependency_file) $<
+       $(AM_V_GEN)$(PERL) -I$(WebCore)/bindings/scripts $(WebCore)/bindings/scripts/generate-bindings.pl --include $(WebCore)/Modules --include $(WebCore)/dom --include $(WebCore)/html --include $(WebCore)/css --include $(WebCore)/page --include $(WebCore)/fileapi --include $(WebCore)/xml --include $(WebCore)/svg --outputDir "$(GENSOURCES_WEBKITDOM)" --defines "LANGUAGE_GOBJECT=1 $(gdom_feature_defines)" --generator GObject --supplementalDependencyFile $(supplemental_dependency_file) $<
 
 libwebkitdomincludedir = $(libwebkitgtkincludedir)/webkitdom
 nodist_libwebkitdominclude_HEADERS = \
index 292df64..86cf5cd 100644 (file)
@@ -6,6 +6,7 @@
 # Copyright (C) 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
 # Copyright (C) 2009 Cameron McCormack <cam@mcc.id.au>
 # Copyright (C) Research In Motion Limited 2010. All rights reserved.
+# Copyright (C) 2013 Samsung Electronics. All rights reserved.
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Library General Public
@@ -53,6 +54,13 @@ my %primitiveTypeHash = ( "boolean" => 1, "void" => 1, "Date" => 1);
 
 my %stringTypeHash = ("DOMString" => 1, "AtomicString" => 1);
 
+# WebCore types used directly in IDL files.
+my %webCoreTypeHash = (
+    "CompareHow" => 1,
+    "SerializedScriptValue" => 1,
+    "Dictionary" => 1
+);
+
 my %enumTypeHash = ();
 
 my %nonPointerTypeHash = ("DOMTimeStamp" => 1, "CompareHow" => 1);
@@ -665,6 +673,40 @@ sub SetterExpression
     return ($functionName, $contentAttributeName);
 }
 
+sub IsWrapperType
+{
+    my $object = shift;
+    my $type = shift;
+
+    return 0 if $object->IsPrimitiveType($type);
+    return 0 if $object->GetArrayType($type);
+    return 0 if $object->GetSequenceType($type);
+    return 0 if $object->IsEnumType($type);
+    return 0 if $object->IsStringType($type);
+    return 0 if $webCoreTypeHash{$type};
+    return 0 if $type eq "any";
+
+    return 1;
+}
+
+sub IsCallbackInterface
+{
+  my $object = shift;
+  my $type = shift;
+
+  return 0 unless $object->IsWrapperType($type);
+
+  my $idlFile = $object->IDLFileForInterface($type)
+      or die("Could NOT find IDL file for interface \"$type\"!\n");
+
+  open FILE, "<", $idlFile;
+  my @lines = <FILE>;
+  close FILE;
+
+  my $fileContents = join('', @lines);
+  return ($fileContents =~ /callback\s+interface\s+(\w+)/gs);
+}
+
 sub GenerateConditionalString
 {
     my $generator = shift;
index 69c0db1..02c2d3d 100644 (file)
@@ -293,12 +293,12 @@ sub SkipFunction {
         return 1;
     }
 
-    # Skip functions that have ["Callback"] parameters, because this
+    # Skip functions that have callback parameters, because this
     # code generator doesn't know how to auto-generate callbacks.
     # Skip functions that have "MediaQueryListListener" or sequence<T> parameters, because this
     # code generator doesn't know how to auto-generate MediaQueryListListener or sequence<T>.
     foreach my $param (@{$function->parameters}) {
-        if ($param->extendedAttributes->{"Callback"} ||
+        if ($codeGenerator->IsCallbackInterface($param->type) ||
             $param->extendedAttributes->{"Clamp"} ||
             $param->type eq "MediaQueryListListener" ||
             $codeGenerator->GetSequenceType($param->type)) {
index 971bfd5..5fd0f8e 100644 (file)
@@ -10,6 +10,7 @@
 # Copyright (C) 2011 Patrick Gansterer <paroga@webkit.org>
 # Copyright (C) 2012 Ericsson AB. All rights reserved.
 # Copyright (C) 2007, 2008, 2009, 2012 Google Inc.
+# Copyright (C) 2013 Samsung Electronics. All rights reserved.
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Library General Public
@@ -1293,7 +1294,7 @@ sub GenerateParametersCheckExpression
                 push(@andExpression, "(${value}.isUndefinedOrNull() || ${value}.isString() || ${value}.isObject())");
                 $usedArguments{$parameterIndex} = 1;
             }
-        } elsif ($parameter->extendedAttributes->{"Callback"}) {
+        } elsif ($codeGenerator->IsCallbackInterface($parameter->type)) {
             # For Callbacks only checks if the value is null or object.
             push(@andExpression, "(${value}.isNull() || ${value}.isFunction())");
             $usedArguments{$parameterIndex} = 1;
@@ -2898,7 +2899,7 @@ sub GenerateParametersCheck
         # Optional arguments with [Optional=...] should not generate the early call.
         # Optional Dictionary arguments always considered to have default of empty dictionary.
         my $optional = $parameter->extendedAttributes->{"Optional"};
-        if ($optional && $optional ne "DefaultIsUndefined" && $optional ne "DefaultIsNullString" && $argType ne "Dictionary" && !$parameter->extendedAttributes->{"Callback"}) {
+        if ($optional && $optional ne "DefaultIsUndefined" && $optional ne "DefaultIsNullString" && $argType ne "Dictionary" && !$codeGenerator->IsCallbackInterface($parameter->type)) {
             # Generate early call if there are enough parameters.
             if (!$hasOptionalArguments) {
                 push(@$outputArray, "\n    size_t argsCount = exec->argumentCount();\n");
@@ -2926,7 +2927,7 @@ sub GenerateParametersCheck
             push(@$outputArray, "            return JSValue::encode(jsUndefined());\n");
             push(@$outputArray, "        resolver = customResolver.get();\n");
             push(@$outputArray, "    }\n");
-        } elsif ($parameter->extendedAttributes->{"Callback"}) {
+        } elsif ($codeGenerator->IsCallbackInterface($parameter->type)) {
             my $callbackClassName = GetCallbackClassName($argType);
             $implIncludes{"$callbackClassName.h"} = 1;
             if ($optional) {
index 32c8909..d24f588 100644 (file)
@@ -22,7 +22,6 @@ ActiveDOMObject
 CPPPureInterface
 CachedAttribute
 CallWith=ScriptExecutionContext|ScriptState|ScriptArguments|CallStack
-Callback
 CheckSecurity
 CheckSecurityForNode
 Clamp
index 2e84295..a66f167 100644 (file)
 
 #include "WebDOMTestCallback.h"
 
-#include "Class1.h"
-#include "Class2.h"
-#include "Class3.h"
-#include "Class8.h"
 #include "DOMStringList.h"
+#include "Float32Array.h"
 #include "KURL.h"
-#include "ThisClass.h"
-#include "WebDOMClass1.h"
-#include "WebDOMClass2.h"
-#include "WebDOMClass3.h"
-#include "WebDOMClass8.h"
+#include "SerializedScriptValue.h"
+#include "TestNode.h"
 #include "WebDOMDOMStringList.h"
+#include "WebDOMFloat32Array.h"
 #include "WebDOMString.h"
-#include "WebDOMThisClass.h"
+#include "WebDOMTestNode.h"
 #include "WebExceptionHandler.h"
 #include "wtf/text/AtomicString.h"
 #include <wtf/GetPtr.h>
@@ -96,28 +91,28 @@ bool WebDOMTestCallback::callbackWithNoParam()
     return impl()->callbackWithNoParam();
 }
 
-bool WebDOMTestCallback::callbackWithClass1Param(const WebDOMClass1& class1Param)
+bool WebDOMTestCallback::callbackWithArrayParam(const WebDOMFloat32Array& arrayParam)
 {
     if (!impl())
         return false;
 
-    return impl()->callbackWithClass1Param(toWebCore(class1Param));
+    return impl()->callbackWithArrayParam(toWebCore(arrayParam));
 }
 
-bool WebDOMTestCallback::callbackWithClass2Param(const WebDOMClass2& class2Param, const WebDOMString& strArg)
+bool WebDOMTestCallback::callbackWithSerializedScriptValueParam(const WebDOMString& srzParam, const WebDOMString& strArg)
 {
     if (!impl())
         return false;
 
-    return impl()->callbackWithClass2Param(toWebCore(class2Param), strArg);
+    return impl()->callbackWithSerializedScriptValueParam(WebCore::SerializedScriptValue::create(WTF::String(srzParam)), strArg);
 }
 
-int WebDOMTestCallback::callbackWithNonBoolReturnType(const WebDOMClass3& class3Param)
+int WebDOMTestCallback::callbackWithNonBoolReturnType(const WebDOMString& strArg)
 {
     if (!impl())
         return 0;
 
-    return impl()->callbackWithNonBoolReturnType(toWebCore(class3Param));
+    return impl()->callbackWithNonBoolReturnType(strArg);
 }
 
 bool WebDOMTestCallback::callbackWithStringList(const WebDOMDOMStringList& listParam)
@@ -136,12 +131,12 @@ bool WebDOMTestCallback::callbackWithBoolean(bool boolParam)
     return impl()->callbackWithBoolean(boolParam);
 }
 
-bool WebDOMTestCallback::callbackRequiresThisToPass(const WebDOMClass8& class8Param, const WebDOMThisClass& thisClassParam)
+bool WebDOMTestCallback::callbackRequiresThisToPass(int longParam, const WebDOMTestNode& testNodeParam)
 {
     if (!impl())
         return false;
 
-    return impl()->callbackRequiresThisToPass(toWebCore(class8Param), toWebCore(thisClassParam));
+    return impl()->callbackRequiresThisToPass(longParam, toWebCore(testNodeParam));
 }
 
 WebCore::TestCallback* toWebCore(const WebDOMTestCallback& wrapper)
index 8d9a230..eb8dc21 100644 (file)
@@ -32,12 +32,10 @@ namespace WebCore {
 class TestCallback;
 };
 
-class WebDOMClass1;
-class WebDOMClass2;
-class WebDOMClass3;
-class WebDOMClass8;
 class WebDOMDOMStringList;
-class WebDOMThisClass;
+class WebDOMFloat32Array;
+class WebDOMString;
+class WebDOMTestNode;
 
 class WebDOMTestCallback : public WebDOMObject {
 public:
@@ -48,12 +46,12 @@ public:
     virtual ~WebDOMTestCallback();
 
     bool callbackWithNoParam();
-    bool callbackWithClass1Param(const WebDOMClass1& class1Param);
-    bool callbackWithClass2Param(const WebDOMClass2& class2Param, const WebDOMString& strArg);
-    int callbackWithNonBoolReturnType(const WebDOMClass3& class3Param);
+    bool callbackWithArrayParam(const WebDOMFloat32Array& arrayParam);
+    bool callbackWithSerializedScriptValueParam(const WebDOMString& srzParam, const WebDOMString& strArg);
+    int callbackWithNonBoolReturnType(const WebDOMString& strArg);
     bool callbackWithStringList(const WebDOMDOMStringList& listParam);
     bool callbackWithBoolean(bool boolParam);
-    bool callbackRequiresThisToPass(const WebDOMClass8& class8Param, const WebDOMThisClass& thisClassParam);
+    bool callbackRequiresThisToPass(int longParam, const WebDOMTestNode& testNodeParam);
 
     WebCore::TestCallback* impl() const;
 
index d651010..d0fde51 100644 (file)
@@ -29,6 +29,7 @@
 #include "SVGPoint.h"
 #include "SerializedScriptValue.h"
 #include "TestEnumType.h"
+#include "TestNode.h"
 #include "WebDOMDictionary.h"
 #include "WebDOMDocument.h"
 #include "WebDOMNode.h"
 #include "WebDOMSVGPoint.h"
 #include "WebDOMString.h"
 #include "WebDOMTestEnumType.h"
+#include "WebDOMTestNode.h"
 #include "WebDOMTestObj.h"
-#include "WebDOMa.h"
-#include "WebDOMb.h"
 #include "WebDOMbool.h"
-#include "WebDOMd.h"
-#include "WebDOMe.h"
 #include "WebExceptionHandler.h"
 #include "WebNativeEventListener.h"
-#include "a.h"
-#include "b.h"
 #include "bool.h"
-#include "d.h"
-#include "e.h"
 #include "wtf/text/AtomicString.h"
 #include <wtf/GetPtr.h>
 #include <wtf/RefPtr.h>
@@ -972,7 +966,7 @@ void WebDOMTestObj::overloadedMethod1(const WebDOMString& type)
 
 #endif
 
-void WebDOMTestObj::convert1(const WebDOMa& value)
+void WebDOMTestObj::convert1(const WebDOMTestNode& value)
 {
     if (!impl())
         return;
@@ -980,7 +974,7 @@ void WebDOMTestObj::convert1(const WebDOMa& value)
     impl()->convert1(toWebCore(value));
 }
 
-void WebDOMTestObj::convert2(const WebDOMb& value)
+void WebDOMTestObj::convert2(const WebDOMTestNode& value)
 {
     if (!impl())
         return;
@@ -988,7 +982,7 @@ void WebDOMTestObj::convert2(const WebDOMb& value)
     impl()->convert2(toWebCore(value));
 }
 
-void WebDOMTestObj::convert4(const WebDOMd& value)
+void WebDOMTestObj::convert4(const WebDOMTestNode& value)
 {
     if (!impl())
         return;
@@ -996,7 +990,7 @@ void WebDOMTestObj::convert4(const WebDOMd& value)
     impl()->convert4(toWebCore(value));
 }
 
-void WebDOMTestObj::convert5(const WebDOMe& value)
+void WebDOMTestObj::convert5(const WebDOMTestNode& value)
 {
     if (!impl())
         return;
index c1c17d2..bbd1dfb 100644 (file)
@@ -38,12 +38,9 @@ class WebDOMObject;
 class WebDOMSVGPoint;
 class WebDOMString;
 class WebDOMTestEnumType;
+class WebDOMTestNode;
 class WebDOMTestObj;
-class WebDOMa;
-class WebDOMb;
 class WebDOMbool;
-class WebDOMd;
-class WebDOMe;
 
 class WebDOMTestObj : public WebDOMObject {
 public:
@@ -191,10 +188,10 @@ public:
 #if ENABLE(Condition1)
     void overloadedMethod1(const WebDOMString& type);
 #endif
-    void convert1(const WebDOMa& value);
-    void convert2(const WebDOMb& value);
-    void convert4(const WebDOMd& value);
-    void convert5(const WebDOMe& value);
+    void convert1(const WebDOMTestNode& value);
+    void convert2(const WebDOMTestNode& value);
+    void convert4(const WebDOMTestNode& value);
+    void convert5(const WebDOMTestNode& value);
     WebDOMSVGPoint mutablePointFunction();
     WebDOMSVGPoint immutablePointFunction();
     void banana();
index e1e8f50..bafce79 100644 (file)
 
 #include "WebDOMTestSerializedScriptValueInterface.h"
 
-#include "Array.h"
+#include "Int32Array.h"
 #include "MessagePortArray.h"
 #include "SerializedScriptValue.h"
-#include "WebDOMArray.h"
+#include "WebDOMInt32Array.h"
 #include "WebDOMMessagePortArray.h"
 #include "WebExceptionHandler.h"
 #include <wtf/GetPtr.h>
@@ -134,7 +134,7 @@ WebDOMString WebDOMTestSerializedScriptValueInterface::cachedReadonlyValue() con
     return impl()->cachedReadonlyValue()->toString();
 }
 
-void WebDOMTestSerializedScriptValueInterface::acceptTransferList(const WebDOMString& data, const WebDOMArray& transferList)
+void WebDOMTestSerializedScriptValueInterface::acceptTransferList(const WebDOMString& data, const WebDOMInt32Array& transferList)
 {
     if (!impl())
         return;
@@ -142,7 +142,7 @@ void WebDOMTestSerializedScriptValueInterface::acceptTransferList(const WebDOMSt
     impl()->acceptTransferList(WebCore::SerializedScriptValue::create(WTF::String(data)), toWebCore(transferList));
 }
 
-void WebDOMTestSerializedScriptValueInterface::multiTransferList(const WebDOMString& first, const WebDOMArray& tx, const WebDOMString& second, const WebDOMArray& txx)
+void WebDOMTestSerializedScriptValueInterface::multiTransferList(const WebDOMString& first, const WebDOMInt32Array& tx, const WebDOMString& second, const WebDOMInt32Array& txx)
 {
     if (!impl())
         return;
index 13e5655..70884f7 100644 (file)
@@ -32,7 +32,7 @@ namespace WebCore {
 class TestSerializedScriptValueInterface;
 };
 
-class WebDOMArray;
+class WebDOMInt32Array;
 class WebDOMMessagePortArray;
 class WebDOMString;
 
@@ -52,8 +52,8 @@ public:
     WebDOMMessagePortArray ports() const;
     WebDOMString cachedReadonlyValue() const;
 
-    void acceptTransferList(const WebDOMString& data, const WebDOMArray& transferList);
-    void multiTransferList(const WebDOMString& first, const WebDOMArray& tx, const WebDOMString& second, const WebDOMArray& txx);
+    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;
 
index d016a34..0942918 100644 (file)
 #include "config.h"
 #include "WebDOMTestTypedefs.h"
 
-#include "Array.h"
+#include "Int32Array.h"
 #include "KURL.h"
 #include "SVGPoint.h"
 #include "SerializedScriptValue.h"
-#include "WebDOMArray.h"
+#include "WebDOMInt32Array.h"
 #include "WebDOMSVGPoint.h"
 #include "WebDOMString.h"
 #include "WebExceptionHandler.h"
@@ -192,7 +192,7 @@ void WebDOMTestTypedefs::func(const WebDOMlong[]& x)
     impl()->func(toWebCore(x));
 }
 
-void WebDOMTestTypedefs::multiTransferList(const WebDOMString& first, const WebDOMArray& tx, const WebDOMString& second, const WebDOMArray& txx)
+void WebDOMTestTypedefs::multiTransferList(const WebDOMString& first, const WebDOMInt32Array& tx, const WebDOMString& second, const WebDOMInt32Array& txx)
 {
     if (!impl())
         return;
index 7dc1925..c4d7fc7 100644 (file)
@@ -30,8 +30,8 @@ namespace WebCore {
 class TestTypedefs;
 };
 
-class WebDOMArray;
 class WebDOMDOMString[];
+class WebDOMInt32Array;
 class WebDOMSVGPoint;
 class WebDOMString;
 class WebDOMlong[];
@@ -58,7 +58,7 @@ public:
     void setStringAttrWithSetterException(const WebDOMString&);
 
     void func(const WebDOMlong[]& x);
-    void multiTransferList(const WebDOMString& first, const WebDOMArray& tx, const WebDOMString& second, const WebDOMArray& txx);
+    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 f6db2cf..400425e 100644 (file)
 #include "DOMObjectCache.h"
 #include "ExceptionCode.h"
 #include "JSMainThreadExecState.h"
-#include "WebKitDOMClass1Private.h"
-#include "WebKitDOMClass2Private.h"
-#include "WebKitDOMClass3Private.h"
-#include "WebKitDOMClass8Private.h"
 #include "WebKitDOMDOMStringListPrivate.h"
+#include "WebKitDOMFloat32ArrayPrivate.h"
 #include "WebKitDOMPrivate.h"
+#include "WebKitDOMSerializedScriptValuePrivate.h"
 #include "WebKitDOMTestCallbackPrivate.h"
-#include "WebKitDOMThisClassPrivate.h"
+#include "WebKitDOMTestNodePrivate.h"
 #include "gobject/ConvertToUTF8String.h"
 #include <wtf/GetPtr.h>
 #include <wtf/RefPtr.h>
@@ -128,15 +126,15 @@ webkit_dom_test_callback_callback_with_no_param(WebKitDOMTestCallback* self)
 }
 
 gboolean
-webkit_dom_test_callback_callback_with_class1param(WebKitDOMTestCallback* self, WebKitDOMClass1* class1Param)
+webkit_dom_test_callback_callback_with_array_param(WebKitDOMTestCallback* self, WebKitDOMFloat32Array* arrayParam)
 {
 #if ENABLE(SQL_DATABASE)
     WebCore::JSMainThreadNullState state;
     g_return_val_if_fail(WEBKIT_DOM_IS_TEST_CALLBACK(self), FALSE);
-    g_return_val_if_fail(WEBKIT_DOM_IS_CLASS1(class1Param), FALSE);
+    g_return_val_if_fail(WEBKIT_DOM_IS_FLOAT32ARRAY(arrayParam), FALSE);
     WebCore::TestCallback* item = WebKit::core(self);
-    WebCore::Class1* convertedClass1Param = WebKit::core(class1Param);
-    gboolean result = item->callbackWithClass1Param(convertedClass1Param);
+    WebCore::Float32Array* convertedArrayParam = WebKit::core(arrayParam);
+    gboolean result = item->callbackWithArrayParam(convertedArrayParam);
     return result;
 #else
     WEBKIT_WARN_FEATURE_NOT_PRESENT("SQL Database")
@@ -145,17 +143,17 @@ webkit_dom_test_callback_callback_with_class1param(WebKitDOMTestCallback* self,
 }
 
 gboolean
-webkit_dom_test_callback_callback_with_class2param(WebKitDOMTestCallback* self, WebKitDOMClass2* class2Param, const gchar* strArg)
+webkit_dom_test_callback_callback_with_serialized_script_value_param(WebKitDOMTestCallback* self, WebKitDOMSerializedScriptValue* srzParam, const gchar* strArg)
 {
 #if ENABLE(SQL_DATABASE)
     WebCore::JSMainThreadNullState state;
     g_return_val_if_fail(WEBKIT_DOM_IS_TEST_CALLBACK(self), FALSE);
-    g_return_val_if_fail(WEBKIT_DOM_IS_CLASS2(class2Param), FALSE);
+    g_return_val_if_fail(WEBKIT_DOM_IS_SERIALIZED_SCRIPT_VALUE(srzParam), FALSE);
     g_return_val_if_fail(strArg, FALSE);
     WebCore::TestCallback* item = WebKit::core(self);
-    WebCore::Class2* convertedClass2Param = WebKit::core(class2Param);
+    WebCore::SerializedScriptValue* convertedSrzParam = WebKit::core(srzParam);
     WTF::String convertedStrArg = WTF::String::fromUTF8(strArg);
-    gboolean result = item->callbackWithClass2Param(convertedClass2Param, convertedStrArg);
+    gboolean result = item->callbackWithSerializedScriptValueParam(convertedSrzParam, convertedStrArg);
     return result;
 #else
     WEBKIT_WARN_FEATURE_NOT_PRESENT("SQL Database")
@@ -164,15 +162,15 @@ webkit_dom_test_callback_callback_with_class2param(WebKitDOMTestCallback* self,
 }
 
 glong
-webkit_dom_test_callback_callback_with_non_bool_return_type(WebKitDOMTestCallback* self, WebKitDOMClass3* class3Param)
+webkit_dom_test_callback_callback_with_non_bool_return_type(WebKitDOMTestCallback* self, const gchar* strArg)
 {
 #if ENABLE(SQL_DATABASE)
     WebCore::JSMainThreadNullState state;
     g_return_val_if_fail(WEBKIT_DOM_IS_TEST_CALLBACK(self), 0);
-    g_return_val_if_fail(WEBKIT_DOM_IS_CLASS3(class3Param), 0);
+    g_return_val_if_fail(strArg, 0);
     WebCore::TestCallback* item = WebKit::core(self);
-    WebCore::Class3* convertedClass3Param = WebKit::core(class3Param);
-    glong result = item->callbackWithNonBoolReturnType(convertedClass3Param);
+    WTF::String convertedStrArg = WTF::String::fromUTF8(strArg);
+    glong result = item->callbackWithNonBoolReturnType(convertedStrArg);
     return result;
 #else
     WEBKIT_WARN_FEATURE_NOT_PRESENT("SQL Database")
@@ -213,17 +211,15 @@ webkit_dom_test_callback_callback_with_boolean(WebKitDOMTestCallback* self, gboo
 }
 
 gboolean
-webkit_dom_test_callback_callback_requires_this_to_pass(WebKitDOMTestCallback* self, WebKitDOMClass8* class8Param, WebKitDOMThisClass* thisClassParam)
+webkit_dom_test_callback_callback_requires_this_to_pass(WebKitDOMTestCallback* self, glong longParam, WebKitDOMTestNode* testNodeParam)
 {
 #if ENABLE(SQL_DATABASE)
     WebCore::JSMainThreadNullState state;
     g_return_val_if_fail(WEBKIT_DOM_IS_TEST_CALLBACK(self), FALSE);
-    g_return_val_if_fail(WEBKIT_DOM_IS_CLASS8(class8Param), FALSE);
-    g_return_val_if_fail(WEBKIT_DOM_IS_THIS_CLASS(thisClassParam), FALSE);
+    g_return_val_if_fail(WEBKIT_DOM_IS_TEST_NODE(testNodeParam), FALSE);
     WebCore::TestCallback* item = WebKit::core(self);
-    WebCore::Class8* convertedClass8Param = WebKit::core(class8Param);
-    WebCore::ThisClass* convertedThisClassParam = WebKit::core(thisClassParam);
-    gboolean result = item->callbackRequiresThisToPass(convertedClass8Param, convertedThisClassParam);
+    WebCore::TestNode* convertedTestNodeParam = WebKit::core(testNodeParam);
+    gboolean result = item->callbackRequiresThisToPass(longParam, convertedTestNodeParam);
     return result;
 #else
     WEBKIT_WARN_FEATURE_NOT_PRESENT("SQL Database")
index 5b61163..b2fa85d 100644 (file)
@@ -60,38 +60,38 @@ WEBKIT_API gboolean
 webkit_dom_test_callback_callback_with_no_param(WebKitDOMTestCallback* self);
 
 /**
- * webkit_dom_test_callback_callback_with_class1param:
+ * webkit_dom_test_callback_callback_with_array_param:
  * @self: A #WebKitDOMTestCallback
- * @class1Param: A #WebKitDOMClass1
+ * @arrayParam: A #WebKitDOMFloat32Array
  *
  * Returns:
  *
 **/
 WEBKIT_API gboolean
-webkit_dom_test_callback_callback_with_class1param(WebKitDOMTestCallback* self, WebKitDOMClass1* class1Param);
+webkit_dom_test_callback_callback_with_array_param(WebKitDOMTestCallback* self, WebKitDOMFloat32Array* arrayParam);
 
 /**
- * webkit_dom_test_callback_callback_with_class2param:
+ * webkit_dom_test_callback_callback_with_serialized_script_value_param:
  * @self: A #WebKitDOMTestCallback
- * @class2Param: A #WebKitDOMClass2
+ * @srzParam: A #WebKitDOMSerializedScriptValue
  * @strArg: A #gchar
  *
  * Returns:
  *
 **/
 WEBKIT_API gboolean
-webkit_dom_test_callback_callback_with_class2param(WebKitDOMTestCallback* self, WebKitDOMClass2* class2Param, const gchar* strArg);
+webkit_dom_test_callback_callback_with_serialized_script_value_param(WebKitDOMTestCallback* self, WebKitDOMSerializedScriptValue* srzParam, const gchar* strArg);
 
 /**
  * webkit_dom_test_callback_callback_with_non_bool_return_type:
  * @self: A #WebKitDOMTestCallback
- * @class3Param: A #WebKitDOMClass3
+ * @strArg: A #gchar
  *
  * Returns:
  *
 **/
 WEBKIT_API glong
-webkit_dom_test_callback_callback_with_non_bool_return_type(WebKitDOMTestCallback* self, WebKitDOMClass3* class3Param);
+webkit_dom_test_callback_callback_with_non_bool_return_type(WebKitDOMTestCallback* self, const gchar* strArg);
 
 /**
  * webkit_dom_test_callback_callback_with_string_list:
@@ -118,14 +118,14 @@ webkit_dom_test_callback_callback_with_boolean(WebKitDOMTestCallback* self, gboo
 /**
  * webkit_dom_test_callback_callback_requires_this_to_pass:
  * @self: A #WebKitDOMTestCallback
- * @class8Param: A #WebKitDOMClass8
- * @thisClassParam: A #WebKitDOMThisClass
+ * @longParam: A #glong
+ * @testNodeParam: A #WebKitDOMTestNode
  *
  * Returns:
  *
 **/
 WEBKIT_API gboolean
-webkit_dom_test_callback_callback_requires_this_to_pass(WebKitDOMTestCallback* self, WebKitDOMClass8* class8Param, WebKitDOMThisClass* thisClassParam);
+webkit_dom_test_callback_callback_requires_this_to_pass(WebKitDOMTestCallback* self, glong longParam, WebKitDOMTestNode* testNodeParam);
 
 G_END_DECLS
 
index 9026652..23da41a 100644 (file)
 #include "WebKitDOMSVGPointPrivate.h"
 #include "WebKitDOMSerializedScriptValuePrivate.h"
 #include "WebKitDOMTestEnumTypePrivate.h"
+#include "WebKitDOMTestNodePrivate.h"
 #include "WebKitDOMTestObjPrivate.h"
-#include "WebKitDOMaPrivate.h"
-#include "WebKitDOMbPrivate.h"
 #include "WebKitDOMboolPrivate.h"
-#include "WebKitDOMdPrivate.h"
-#include "WebKitDOMePrivate.h"
 #include "gobject/ConvertToUTF8String.h"
 #include <wtf/GetPtr.h>
 #include <wtf/RefPtr.h>
@@ -1380,46 +1377,46 @@ webkit_dom_test_obj_overloaded_method1(WebKitDOMTestObj* self, const gchar* type
 }
 
 void
-webkit_dom_test_obj_convert1(WebKitDOMTestObj* self, WebKitDOMa* value)
+webkit_dom_test_obj_convert1(WebKitDOMTestObj* self, WebKitDOMTestNode* value)
 {
     WebCore::JSMainThreadNullState state;
     g_return_if_fail(WEBKIT_DOM_IS_TEST_OBJ(self));
-    g_return_if_fail(WEBKIT_DOM_IS_A(value));
+    g_return_if_fail(WEBKIT_DOM_IS_TEST_NODE(value));
     WebCore::TestObj* item = WebKit::core(self);
-    WebCore::a* convertedValue = WebKit::core(value);
+    WebCore::TestNode* convertedValue = WebKit::core(value);
     item->convert1(convertedValue);
 }
 
 void
-webkit_dom_test_obj_convert2(WebKitDOMTestObj* self, WebKitDOMb* value)
+webkit_dom_test_obj_convert2(WebKitDOMTestObj* self, WebKitDOMTestNode* value)
 {
     WebCore::JSMainThreadNullState state;
     g_return_if_fail(WEBKIT_DOM_IS_TEST_OBJ(self));
-    g_return_if_fail(WEBKIT_DOM_IS_B(value));
+    g_return_if_fail(WEBKIT_DOM_IS_TEST_NODE(value));
     WebCore::TestObj* item = WebKit::core(self);
-    WebCore::b* convertedValue = WebKit::core(value);
+    WebCore::TestNode* convertedValue = WebKit::core(value);
     item->convert2(convertedValue);
 }
 
 void
-webkit_dom_test_obj_convert4(WebKitDOMTestObj* self, WebKitDOMd* value)
+webkit_dom_test_obj_convert4(WebKitDOMTestObj* self, WebKitDOMTestNode* value)
 {
     WebCore::JSMainThreadNullState state;
     g_return_if_fail(WEBKIT_DOM_IS_TEST_OBJ(self));
-    g_return_if_fail(WEBKIT_DOM_IS_D(value));
+    g_return_if_fail(WEBKIT_DOM_IS_TEST_NODE(value));
     WebCore::TestObj* item = WebKit::core(self);
-    WebCore::d* convertedValue = WebKit::core(value);
+    WebCore::TestNode* convertedValue = WebKit::core(value);
     item->convert4(convertedValue);
 }
 
 void
-webkit_dom_test_obj_convert5(WebKitDOMTestObj* self, WebKitDOMe* value)
+webkit_dom_test_obj_convert5(WebKitDOMTestObj* self, WebKitDOMTestNode* value)
 {
     WebCore::JSMainThreadNullState state;
     g_return_if_fail(WEBKIT_DOM_IS_TEST_OBJ(self));
-    g_return_if_fail(WEBKIT_DOM_IS_E(value));
+    g_return_if_fail(WEBKIT_DOM_IS_TEST_NODE(value));
     WebCore::TestObj* item = WebKit::core(self);
-    WebCore::e* convertedValue = WebKit::core(value);
+    WebCore::TestNode* convertedValue = WebKit::core(value);
     item->convert5(convertedValue);
 }
 
index af536b0..7c992c3 100644 (file)
@@ -404,46 +404,46 @@ webkit_dom_test_obj_overloaded_method1(WebKitDOMTestObj* self, const gchar* type
 /**
  * webkit_dom_test_obj_convert1:
  * @self: A #WebKitDOMTestObj
- * @value: A #WebKitDOMa
+ * @value: A #WebKitDOMTestNode
  *
  * Returns:
  *
 **/
 WEBKIT_API void
-webkit_dom_test_obj_convert1(WebKitDOMTestObj* self, WebKitDOMa* value);
+webkit_dom_test_obj_convert1(WebKitDOMTestObj* self, WebKitDOMTestNode* value);
 
 /**
  * webkit_dom_test_obj_convert2:
  * @self: A #WebKitDOMTestObj
- * @value: A #WebKitDOMb
+ * @value: A #WebKitDOMTestNode
  *
  * Returns:
  *
 **/
 WEBKIT_API void
-webkit_dom_test_obj_convert2(WebKitDOMTestObj* self, WebKitDOMb* value);
+webkit_dom_test_obj_convert2(WebKitDOMTestObj* self, WebKitDOMTestNode* value);
 
 /**
  * webkit_dom_test_obj_convert4:
  * @self: A #WebKitDOMTestObj
- * @value: A #WebKitDOMd
+ * @value: A #WebKitDOMTestNode
  *
  * Returns:
  *
 **/
 WEBKIT_API void
-webkit_dom_test_obj_convert4(WebKitDOMTestObj* self, WebKitDOMd* value);
+webkit_dom_test_obj_convert4(WebKitDOMTestObj* self, WebKitDOMTestNode* value);
 
 /**
  * webkit_dom_test_obj_convert5:
  * @self: A #WebKitDOMTestObj
- * @value: A #WebKitDOMe
+ * @value: A #WebKitDOMTestNode
  *
  * Returns:
  *
 **/
 WEBKIT_API void
-webkit_dom_test_obj_convert5(WebKitDOMTestObj* self, WebKitDOMe* value);
+webkit_dom_test_obj_convert5(WebKitDOMTestObj* self, WebKitDOMTestNode* value);
 
 /**
  * webkit_dom_test_obj_mutable_point_function:
index 32ed883..db65fce 100644 (file)
@@ -25,7 +25,7 @@
 #include "DOMObjectCache.h"
 #include "ExceptionCode.h"
 #include "JSMainThreadExecState.h"
-#include "WebKitDOMArrayPrivate.h"
+#include "WebKitDOMInt32ArrayPrivate.h"
 #include "WebKitDOMMessagePortArrayPrivate.h"
 #include "WebKitDOMPrivate.h"
 #include "WebKitDOMSerializedScriptValuePrivate.h"
@@ -220,16 +220,16 @@ static void webkit_dom_test_serialized_script_value_interface_init(WebKitDOMTest
 }
 
 void
-webkit_dom_test_serialized_script_value_interface_accept_transfer_list(WebKitDOMTestSerializedScriptValueInterface* self, WebKitDOMSerializedScriptValue* data, WebKitDOMArray* transferList)
+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_ARRAY(transferList));
+    g_return_if_fail(WEBKIT_DOM_IS_INT32ARRAY(transferList));
     WebCore::TestSerializedScriptValueInterface* item = WebKit::core(self);
     WebCore::SerializedScriptValue* convertedData = WebKit::core(data);
-    WebCore::Array* convertedTransferList = WebKit::core(transferList);
+    WebCore::Int32Array* convertedTransferList = WebKit::core(transferList);
     item->acceptTransferList(convertedData, convertedTransferList);
 #else
     WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
@@ -238,20 +238,20 @@ webkit_dom_test_serialized_script_value_interface_accept_transfer_list(WebKitDOM
 }
 
 void
-webkit_dom_test_serialized_script_value_interface_multi_transfer_list(WebKitDOMTestSerializedScriptValueInterface* self, WebKitDOMSerializedScriptValue* first, WebKitDOMArray* tx, WebKitDOMSerializedScriptValue* second, WebKitDOMArray* txx)
+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_ARRAY(tx));
+    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_ARRAY(txx));
+    g_return_if_fail(WEBKIT_DOM_IS_INT32ARRAY(txx));
     WebCore::TestSerializedScriptValueInterface* item = WebKit::core(self);
     WebCore::SerializedScriptValue* convertedFirst = WebKit::core(first);
-    WebCore::Array* convertedTx = WebKit::core(tx);
+    WebCore::Int32Array* convertedTx = WebKit::core(tx);
     WebCore::SerializedScriptValue* convertedSecond = WebKit::core(second);
-    WebCore::Array* convertedTxx = WebKit::core(txx);
+    WebCore::Int32Array* convertedTxx = WebKit::core(txx);
     item->multiTransferList(convertedFirst, convertedTx, convertedSecond, convertedTxx);
 #else
     WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
index 3a2f9d1..65eec1c 100644 (file)
@@ -53,27 +53,27 @@ 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 #WebKitDOMArray
+ * @transferList: A #WebKitDOMInt32Array
  *
  * Returns:
  *
 **/
 WEBKIT_API void
-webkit_dom_test_serialized_script_value_interface_accept_transfer_list(WebKitDOMTestSerializedScriptValueInterface* self, WebKitDOMSerializedScriptValue* data, WebKitDOMArray* transferList);
+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 #WebKitDOMArray
+ * @tx: A #WebKitDOMInt32Array
  * @second: A #WebKitDOMSerializedScriptValue
- * @txx: A #WebKitDOMArray
+ * @txx: A #WebKitDOMInt32Array
  *
  * Returns:
  *
 **/
 WEBKIT_API void
-webkit_dom_test_serialized_script_value_interface_multi_transfer_list(WebKitDOMTestSerializedScriptValueInterface* self, WebKitDOMSerializedScriptValue* first, WebKitDOMArray* tx, WebKitDOMSerializedScriptValue* second, WebKitDOMArray* txx);
+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:
index 2aa99c1..3799750 100644 (file)
@@ -25,8 +25,8 @@
 #include "DOMObjectCache.h"
 #include "ExceptionCode.h"
 #include "JSMainThreadExecState.h"
-#include "WebKitDOMArrayPrivate.h"
 #include "WebKitDOMDOMString[]Private.h"
+#include "WebKitDOMInt32ArrayPrivate.h"
 #include "WebKitDOMPrivate.h"
 #include "WebKitDOMSVGPointPrivate.h"
 #include "WebKitDOMSerializedScriptValuePrivate.h"
@@ -255,19 +255,19 @@ webkit_dom_test_typedefs_func(WebKitDOMTestTypedefs* self, WebKitDOMlong[]* x)
 }
 
 void
-webkit_dom_test_typedefs_multi_transfer_list(WebKitDOMTestTypedefs* self, WebKitDOMSerializedScriptValue* first, WebKitDOMArray* tx, WebKitDOMSerializedScriptValue* second, WebKitDOMArray* txx)
+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_ARRAY(tx));
+    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_ARRAY(txx));
+    g_return_if_fail(WEBKIT_DOM_IS_INT32ARRAY(txx));
     WebCore::TestTypedefs* item = WebKit::core(self);
     WebCore::SerializedScriptValue* convertedFirst = WebKit::core(first);
-    WebCore::Array* convertedTx = WebKit::core(tx);
+    WebCore::Int32Array* convertedTx = WebKit::core(tx);
     WebCore::SerializedScriptValue* convertedSecond = WebKit::core(second);
-    WebCore::Array* convertedTxx = WebKit::core(txx);
+    WebCore::Int32Array* convertedTxx = WebKit::core(txx);
     item->multiTransferList(convertedFirst, convertedTx, convertedSecond, convertedTxx);
 }
 
index 757a38c..1a4a2a8 100644 (file)
@@ -64,15 +64,15 @@ webkit_dom_test_typedefs_func(WebKitDOMTestTypedefs* self, WebKitDOMlong[]* x);
  * webkit_dom_test_typedefs_multi_transfer_list:
  * @self: A #WebKitDOMTestTypedefs
  * @first: A #WebKitDOMSerializedScriptValue
- * @tx: A #WebKitDOMArray
+ * @tx: A #WebKitDOMInt32Array
  * @second: A #WebKitDOMSerializedScriptValue
- * @txx: A #WebKitDOMArray
+ * @txx: A #WebKitDOMInt32Array
  *
  * Returns:
  *
 **/
 WEBKIT_API void
-webkit_dom_test_typedefs_multi_transfer_list(WebKitDOMTestTypedefs* self, WebKitDOMSerializedScriptValue* first, WebKitDOMArray* tx, WebKitDOMSerializedScriptValue* second, WebKitDOMArray* txx);
+webkit_dom_test_typedefs_multi_transfer_list(WebKitDOMTestTypedefs* self, WebKitDOMSerializedScriptValue* first, WebKitDOMInt32Array* tx, WebKitDOMSerializedScriptValue* second, WebKitDOMInt32Array* txx);
 
 /**
  * webkit_dom_test_typedefs_set_shadow:
index 51f47ac..1c44187 100644 (file)
 
 #include "JSTestCallback.h"
 
-#include "JSClass1.h"
-#include "JSClass2.h"
-#include "JSClass8.h"
 #include "JSDOMStringList.h"
-#include "JSThisClass.h"
+#include "JSFloat32Array.h"
+#include "JSTestNode.h"
 #include "ScriptExecutionContext.h"
+#include "SerializedScriptValue.h"
 #include <runtime/JSLock.h>
 
 using namespace JSC;
@@ -74,7 +73,7 @@ bool JSTestCallback::callbackWithNoParam()
     return !raisedException;
 }
 
-bool JSTestCallback::callbackWithClass1Param(Class1* class1Param)
+bool JSTestCallback::callbackWithArrayParam(Float32Array* arrayParam)
 {
     if (!canInvokeCallback())
         return true;
@@ -85,14 +84,14 @@ bool JSTestCallback::callbackWithClass1Param(Class1* class1Param)
 
     ExecState* exec = m_data->globalObject()->globalExec();
     MarkedArgumentBuffer args;
-    args.append(toJS(exec, m_data->globalObject(), class1Param));
+    args.append(toJS(exec, m_data->globalObject(), arrayParam));
 
     bool raisedException = false;
     m_data->invokeCallback(args, &raisedException);
     return !raisedException;
 }
 
-bool JSTestCallback::callbackWithClass2Param(Class2* class2Param, const String& strArg)
+bool JSTestCallback::callbackWithSerializedScriptValueParam(PassRefPtr<SerializedScriptValue> srzParam, const String& strArg)
 {
     if (!canInvokeCallback())
         return true;
@@ -103,7 +102,7 @@ bool JSTestCallback::callbackWithClass2Param(Class2* class2Param, const String&
 
     ExecState* exec = m_data->globalObject()->globalExec();
     MarkedArgumentBuffer args;
-    args.append(toJS(exec, m_data->globalObject(), class2Param));
+    args.append(srzParam ? srzParam->deserialize(exec, m_data->globalObject(), 0) : jsNull());
     args.append(jsStringWithCache(exec, strArg));
 
     bool raisedException = false;
@@ -147,9 +146,9 @@ bool JSTestCallback::callbackWithBoolean(bool boolParam)
     return !raisedException;
 }
 
-bool JSTestCallback::callbackRequiresThisToPass(Class8* class8Param, ThisClass* thisClassParam)
+bool JSTestCallback::callbackRequiresThisToPass(int longParam, TestNode* testNodeParam)
 {
-    ASSERT(thisClassParam);
+    ASSERT(testNodeParam);
 
     if (!canInvokeCallback())
         return true;
@@ -160,12 +159,12 @@ bool JSTestCallback::callbackRequiresThisToPass(Class8* class8Param, ThisClass*
 
     ExecState* exec = m_data->globalObject()->globalExec();
     MarkedArgumentBuffer args;
-    args.append(toJS(exec, m_data->globalObject(), class8Param));
-    args.append(toJS(exec, m_data->globalObject(), thisClassParam));
+    args.append(toJS(exec, m_data->globalObject(), longParam));
+    args.append(toJS(exec, m_data->globalObject(), testNodeParam));
 
     bool raisedException = false;
-    JSValue jsthisClassParam = toJS(exec, m_data->globalObject(), thisClassParam);
-    m_data->invokeCallback(jsthisClassParam, args, &raisedException);
+    JSValue jstestNodeParam = toJS(exec, m_data->globalObject(), testNodeParam);
+    m_data->invokeCallback(jstestNodeParam, args, &raisedException);
 
     return !raisedException;
 }
index 314387c..e9bd78d 100644 (file)
@@ -43,13 +43,13 @@ public:
 
     // Functions
     virtual bool callbackWithNoParam();
-    virtual bool callbackWithClass1Param(Class1* class1Param);
-    virtual bool callbackWithClass2Param(Class2* class2Param, const String& strArg);
-    COMPILE_ASSERT(false)    virtual int callbackWithNonBoolReturnType(Class3* class3Param);
+    virtual bool callbackWithArrayParam(Float32Array* arrayParam);
+    virtual bool callbackWithSerializedScriptValueParam(PassRefPtr<SerializedScriptValue> srzParam, const String& strArg);
+    COMPILE_ASSERT(false)    virtual int callbackWithNonBoolReturnType(const String& strArg);
     virtual int customCallback(Class5* class5Param, Class6* class6Param);
     virtual bool callbackWithStringList(PassRefPtr<DOMStringList> listParam);
     virtual bool callbackWithBoolean(bool boolParam);
-    virtual bool callbackRequiresThisToPass(Class8* class8Param, ThisClass* thisClassParam);
+    virtual bool callbackRequiresThisToPass(int longParam, TestNode* testNodeParam);
 
 private:
     JSTestCallback(JSC::JSObject* callback, JSDOMGlobalObject*);
index e103974..3c3bb6c 100644 (file)
 #include "JSSVGPoint.h"
 #include "JSScriptProfile.h"
 #include "JSTestCallback.h"
+#include "JSTestNode.h"
 #include "JSTestObj.h"
 #include "JSTestSubObj.h"
-#include "JSa.h"
-#include "JSb.h"
 #include "JSbool.h"
-#include "JSd.h"
-#include "JSe.h"
 #include "KURL.h"
 #include "SVGDocument.h"
 #include "SVGStaticPropertyTearOff.h"
@@ -2780,7 +2777,7 @@ EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionConvert1(ExecState* exec)
     TestObj* impl = static_cast<TestObj*>(castedThis->impl());
     if (exec->argumentCount() < 1)
         return throwVMError(exec, createNotEnoughArgumentsError(exec));
-    a* value(toa(exec->argument(0)));
+    TestNode* value(toTestNode(exec->argument(0)));
     if (exec->hadException())
         return JSValue::encode(jsUndefined());
     impl->convert1(value);
@@ -2797,7 +2794,7 @@ EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionConvert2(ExecState* exec)
     TestObj* impl = static_cast<TestObj*>(castedThis->impl());
     if (exec->argumentCount() < 1)
         return throwVMError(exec, createNotEnoughArgumentsError(exec));
-    b* value(tob(exec->argument(0)));
+    TestNode* value(toTestNode(exec->argument(0)));
     if (exec->hadException())
         return JSValue::encode(jsUndefined());
     impl->convert2(value);
@@ -2814,7 +2811,7 @@ EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionConvert4(ExecState* exec)
     TestObj* impl = static_cast<TestObj*>(castedThis->impl());
     if (exec->argumentCount() < 1)
         return throwVMError(exec, createNotEnoughArgumentsError(exec));
-    d* value(tod(exec->argument(0)));
+    TestNode* value(toTestNode(exec->argument(0)));
     if (exec->hadException())
         return JSValue::encode(jsUndefined());
     impl->convert4(value);
@@ -2831,7 +2828,7 @@ EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionConvert5(ExecState* exec)
     TestObj* impl = static_cast<TestObj*>(castedThis->impl());
     if (exec->argumentCount() < 1)
         return throwVMError(exec, createNotEnoughArgumentsError(exec));
-    e* value(toe(exec->argument(0)));
+    TestNode* value(toTestNode(exec->argument(0)));
     if (exec->hadException())
         return JSValue::encode(jsUndefined());
     impl->convert5(value);
index 30db40d..e7534fa 100644 (file)
@@ -25,8 +25,8 @@
 #include "JSTestSerializedScriptValueInterface.h"
 
 #include "ExceptionCode.h"
-#include "JSArray.h"
 #include "JSDOMBinding.h"
+#include "JSInt32Array.h"
 #include "JSMessagePort.h"
 #include "MessagePort.h"
 #include "SerializedScriptValue.h"
@@ -72,7 +72,7 @@ EncodedJSValue JSC_HOST_CALL JSTestSerializedScriptValueInterfaceConstructor::co
     RefPtr<SerializedScriptValue> data(SerializedScriptValue::create(exec, exec->argument(1), 0, 0));
     if (exec->hadException())
         return JSValue::encode(jsUndefined());
-    Array* transferList(toArray(exec->argument(2)));
+    Int32Array* transferList(toInt32Array(exec->argument(2)));
     if (exec->hadException())
         return JSValue::encode(jsUndefined());
     RefPtr<TestSerializedScriptValueInterface> object = TestSerializedScriptValueInterface::create(hello, data, transferList);
@@ -301,7 +301,7 @@ EncodedJSValue JSC_HOST_CALL jsTestSerializedScriptValueInterfacePrototypeFuncti
         return JSValue::encode(jsUndefined());
     }
 
-    Array* transferList(toArray(exec->argument(1)));
+    Int32Array* transferList(toInt32Array(exec->argument(1)));
     if (exec->hadException())
         return JSValue::encode(jsUndefined());
     impl->acceptTransferList(data, transferList);
@@ -331,7 +331,7 @@ EncodedJSValue JSC_HOST_CALL jsTestSerializedScriptValueInterfacePrototypeFuncti
         return JSValue::encode(jsUndefined());
     }
 
-    Array* tx(toArray(exec->argument(1)));
+    Int32Array* tx(toInt32Array(exec->argument(1)));
     if (exec->hadException())
         return JSValue::encode(jsUndefined());
     if (argsCount <= 2) {
@@ -347,7 +347,7 @@ EncodedJSValue JSC_HOST_CALL jsTestSerializedScriptValueInterfacePrototypeFuncti
         return JSValue::encode(jsUndefined());
     }
 
-    Array* txx(toArray(exec->argument(3)));
+    Int32Array* txx(toInt32Array(exec->argument(3)));
     if (exec->hadException())
         return JSValue::encode(jsUndefined());
     impl->multiTransferList(first, tx, second, txx);
index e58757b..cab301d 100644 (file)
@@ -23,9 +23,9 @@
 
 #include "DOMStringList.h"
 #include "ExceptionCode.h"
-#include "JSArray.h"
 #include "JSDOMBinding.h"
 #include "JSDOMStringList.h"
+#include "JSInt32Array.h"
 #include "JSSVGPoint.h"
 #include "JSSerializedScriptValue.h"
 #include "JSTestCallback.h"
@@ -400,7 +400,7 @@ EncodedJSValue JSC_HOST_CALL jsTestTypedefsPrototypeFunctionMultiTransferList(Ex
         return JSValue::encode(jsUndefined());
     }
 
-    Array* tx(toArray(exec->argument(1)));
+    Int32Array* tx(toInt32Array(exec->argument(1)));
     if (exec->hadException())
         return JSValue::encode(jsUndefined());
     if (argsCount <= 2) {
@@ -416,7 +416,7 @@ EncodedJSValue JSC_HOST_CALL jsTestTypedefsPrototypeFunctionMultiTransferList(Ex
         return JSValue::encode(jsUndefined());
     }
 
-    Array* txx(toArray(exec->argument(3)));
+    Int32Array* txx(toInt32Array(exec->argument(3)));
     if (exec->hadException())
         return JSValue::encode(jsUndefined());
     impl->multiTransferList(first, tx, second, txx);
index 7d53b30..5840dd0 100644 (file)
 
 #if WEBKIT_VERSION_MAX_ALLOWED >= WEBKIT_VERSION_LATEST
 
-@class DOMClass1;
-@class DOMClass2;
-@class DOMClass3;
 @class DOMClass5;
 @class DOMClass6;
-@class DOMClass8;
 @class DOMDOMStringList;
-@class DOMThisClass;
+@class DOMFloat32Array;
+@class DOMTestNode;
 @class NSString;
 
 @interface DOMTestCallback : DOMObject
 - (BOOL)callbackWithNoParam;
-- (BOOL)callbackWithClass1Param:(DOMClass1 *)class1Param;
-- (BOOL)callbackWithClass2Param:(DOMClass2 *)class2Param strArg:(NSString *)strArg;
-- (int)callbackWithNonBoolReturnType:(DOMClass3 *)class3Param;
+- (BOOL)callbackWithArrayParam:(DOMFloat32Array *)arrayParam;
+- (BOOL)callbackWithSerializedScriptValueParam:(NSString *)srzParam strArg:(NSString *)strArg;
+- (int)callbackWithNonBoolReturnType:(NSString *)strArg;
 - (int)customCallback:(DOMClass5 *)class5Param class6Param:(DOMClass6 *)class6Param;
 - (BOOL)callbackWithStringList:(DOMDOMStringList *)listParam;
 - (BOOL)callbackWithBoolean:(BOOL)boolParam;
-- (BOOL)callbackRequiresThisToPass:(DOMClass8 *)class8Param thisClassParam:(DOMThisClass *)thisClassParam;
+- (BOOL)callbackRequiresThisToPass:(int)longParam testNodeParam:(DOMTestNode *)testNodeParam;
 @end
 
 #endif
index f2f389c..3534e30 100644 (file)
 
 #import "DOMTestCallback.h"
 
-#import "Class1.h"
-#import "Class2.h"
-#import "Class3.h"
 #import "Class5.h"
 #import "Class6.h"
-#import "Class8.h"
 #import "DOMBlobInternal.h"
 #import "DOMCSSRuleInternal.h"
 #import "DOMCSSValueInternal.h"
-#import "DOMClass1Internal.h"
-#import "DOMClass2Internal.h"
-#import "DOMClass3Internal.h"
 #import "DOMClass5Internal.h"
 #import "DOMClass6Internal.h"
-#import "DOMClass8Internal.h"
 #import "DOMDOMStringListInternal.h"
 #import "DOMEventInternal.h"
+#import "DOMFloat32ArrayInternal.h"
 #import "DOMNodeInternal.h"
 #import "DOMStringList.h"
 #import "DOMStyleSheetInternal.h"
 #import "DOMTestCallbackInternal.h"
-#import "DOMThisClassInternal.h"
+#import "DOMTestNodeInternal.h"
 #import "ExceptionHandlers.h"
+#import "Float32Array.h"
 #import "JSMainThreadExecState.h"
 #import "KURL.h"
+#import "SerializedScriptValue.h"
 #import "TestCallback.h"
-#import "ThisClass.h"
+#import "TestNode.h"
 #import "ThreadCheck.h"
 #import "WebCoreObjCExtras.h"
 #import "WebScriptObjectPrivate.h"
     return IMPL->callbackWithNoParam();
 }
 
-- (BOOL)callbackWithClass1Param:(DOMClass1 *)class1Param
+- (BOOL)callbackWithArrayParam:(DOMFloat32Array *)arrayParam
 {
     WebCore::JSMainThreadNullState state;
-    return IMPL->callbackWithClass1Param(core(class1Param));
+    return IMPL->callbackWithArrayParam(core(arrayParam));
 }
 
-- (BOOL)callbackWithClass2Param:(DOMClass2 *)class2Param strArg:(NSString *)strArg
+- (BOOL)callbackWithSerializedScriptValueParam:(NSString *)srzParam strArg:(NSString *)strArg
 {
     WebCore::JSMainThreadNullState state;
-    return IMPL->callbackWithClass2Param(core(class2Param), strArg);
+    return IMPL->callbackWithSerializedScriptValueParam(WebCore::SerializedScriptValue::create(WTF::String(srzParam)), strArg);
 }
 
-- (int)callbackWithNonBoolReturnType:(DOMClass3 *)class3Param
+- (int)callbackWithNonBoolReturnType:(NSString *)strArg
 {
     WebCore::JSMainThreadNullState state;
-    return IMPL->callbackWithNonBoolReturnType(core(class3Param));
+    return IMPL->callbackWithNonBoolReturnType(strArg);
 }
 
 - (int)customCallback:(DOMClass5 *)class5Param class6Param:(DOMClass6 *)class6Param
     return IMPL->callbackWithBoolean(boolParam);
 }
 
-- (BOOL)callbackRequiresThisToPass:(DOMClass8 *)class8Param thisClassParam:(DOMThisClass *)thisClassParam
+- (BOOL)callbackRequiresThisToPass:(int)longParam testNodeParam:(DOMTestNode *)testNodeParam
 {
     WebCore::JSMainThreadNullState state;
-    return IMPL->callbackRequiresThisToPass(core(class8Param), core(thisClassParam));
+    return IMPL->callbackRequiresThisToPass(longParam, core(testNodeParam));
 }
 
 @end
index 7150061..7a63098 100644 (file)
 @class DOMSVGDocument;
 @class DOMSVGPoint;
 @class DOMTestEnumType;
+@class DOMTestNode;
 @class DOMTestObj;
 @class DOMTestObjectAConstructor;
 @class DOMTestObjectBConstructor;
 @class DOMTestObjectCConstructor;
-@class DOMa;
 @class DOMany;
-@class DOMb;
 @class DOMbool;
-@class DOMd;
-@class DOMe;
 @class NSString;
 @protocol DOMEventListener;
 
@@ -172,10 +169,10 @@ enum {
 - (void)overloadedMethod1:(NSString *)type;
 #endif
 - (DOMSVGDocument *)getSVGDocument;
-- (void)convert1:(DOMa *)value;
-- (void)convert2:(DOMb *)value;
-- (void)convert4:(DOMd *)value;
-- (void)convert5:(DOMe *)value;
+- (void)convert1:(DOMTestNode *)value;
+- (void)convert2:(DOMTestNode *)value;
+- (void)convert4:(DOMTestNode *)value;
+- (void)convert5:(DOMTestNode *)value;
 - (DOMSVGPoint *)mutablePointFunction;
 - (DOMSVGPoint *)immutablePointFunction;
 - (void)orange;
index 3da1490..8996fe5 100644 (file)
 #import "DOMSVGPointInternal.h"
 #import "DOMStyleSheetInternal.h"
 #import "DOMTestEnumTypeInternal.h"
+#import "DOMTestNodeInternal.h"
 #import "DOMTestObjInternal.h"
 #import "DOMTestObjectAConstructorInternal.h"
 #import "DOMTestObjectBConstructorInternal.h"
 #import "DOMTestObjectCConstructorInternal.h"
-#import "DOMaInternal.h"
 #import "DOManyInternal.h"
-#import "DOMbInternal.h"
 #import "DOMboolInternal.h"
-#import "DOMdInternal.h"
-#import "DOMeInternal.h"
 #import "Dictionary.h"
 #import "Document.h"
 #import "EventListener.h"
@@ -63,6 +60,7 @@
 #import "SVGStaticPropertyTearOff.h"
 #import "SerializedScriptValue.h"
 #import "TestEnumType.h"
+#import "TestNode.h"
 #import "TestObj.h"
 #import "TestObjectAConstructor.h"
 #import "TestObjectBConstructor.h"
 #import "ThreadCheck.h"
 #import "WebCoreObjCExtras.h"
 #import "WebScriptObjectPrivate.h"
-#import "a.h"
 #import "any.h"
-#import "b.h"
 #import "bool.h"
-#import "d.h"
-#import "e.h"
 #import <wtf/GetPtr.h>
 
 #define IMPL reinterpret_cast<WebCore::TestObj*>(_internal)
     return result;
 }
 
-- (void)convert1:(DOMa *)value
+- (void)convert1:(DOMTestNode *)value
 {
     WebCore::JSMainThreadNullState state;
     IMPL->convert1(core(value));
 }
 
-- (void)convert2:(DOMb *)value
+- (void)convert2:(DOMTestNode *)value
 {
     WebCore::JSMainThreadNullState state;
     IMPL->convert2(core(value));
 }
 
-- (void)convert4:(DOMd *)value
+- (void)convert4:(DOMTestNode *)value
 {
     WebCore::JSMainThreadNullState state;
     IMPL->convert4(core(value));
 }
 
-- (void)convert5:(DOMe *)value
+- (void)convert5:(DOMTestNode *)value
 {
     WebCore::JSMainThreadNullState state;
     IMPL->convert5(core(value));
index e853b0c..3d12dc7 100644 (file)
@@ -28,7 +28,7 @@
 
 #if WEBKIT_VERSION_MAX_ALLOWED >= WEBKIT_VERSION_LATEST
 
-@class DOMArray;
+@class DOMInt32Array;
 @class DOMMessagePortArray;
 @class NSString;
 
@@ -39,8 +39,8 @@
 @property(readonly, retain) DOMMessagePortArray *ports;
 @property(readonly, retain) NSString *cachedReadonlyValue;
 
-- (void)acceptTransferList:(NSString *)data transferList:(DOMArray *)transferList;
-- (void)multiTransferList:(NSString *)first tx:(DOMArray *)tx second:(NSString *)second txx:(DOMArray *)txx;
+- (void)acceptTransferList:(NSString *)data transferList:(DOMInt32Array *)transferList;
+- (void)multiTransferList:(NSString *)first tx:(DOMInt32Array *)tx second:(NSString *)second txx:(DOMInt32Array *)txx;
 @end
 
 #endif
index 3b9fb73..faa9f33 100644 (file)
 
 #import "DOMTestSerializedScriptValueInterface.h"
 
-#import "Array.h"
-#import "DOMArrayInternal.h"
 #import "DOMBlobInternal.h"
 #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:(DOMArray *)transferList
+- (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:(DOMArray *)tx second:(NSString *)second txx:(DOMArray *)txx
+- (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));
index 4ffd7f3..d1c261d 100644 (file)
@@ -28,7 +28,7 @@
 
 #if WEBKIT_VERSION_MAX_ALLOWED >= WEBKIT_VERSION_LATEST
 
-@class DOMArray;
+@class DOMInt32Array;
 @class DOMSVGPoint;
 @class NSString;
 
@@ -40,7 +40,7 @@
 @property(copy) NSString *stringAttrWithGetterException;
 @property(copy) NSString *stringAttrWithSetterException;
 
-- (void)multiTransferList:(NSString *)first tx:(DOMArray *)tx second:(NSString *)second txx:(DOMArray *)txx;
+- (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 eb02a02..90fdafa 100644 (file)
 
 #import "DOMTestTypedefs.h"
 
-#import "Array.h"
-#import "DOMArrayInternal.h"
 #import "DOMBlobInternal.h"
 #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:(DOMArray *)tx second:(NSString *)second txx:(DOMArray *)txx
+- (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));
index 6b24856..edbd5fd 100644 (file)
     Conditional=SQL_DATABASE,
 ] callback interface TestCallback {
   boolean callbackWithNoParam();
-  boolean callbackWithClass1Param(in Class1 class1Param);
-  boolean callbackWithClass2Param(in Class2 class2Param, in DOMString strArg);
-  long callbackWithNonBoolReturnType(in Class3 class3Param);
+  boolean callbackWithArrayParam(in Float32Array arrayParam);
+  boolean callbackWithSerializedScriptValueParam(in SerializedScriptValue srzParam, in DOMString strArg);
+  long callbackWithNonBoolReturnType(in DOMString strArg);
   [Custom] long customCallback(in Class5 class5Param, in Class6 class6Param);
   boolean callbackWithStringList(in DOMStringList listParam);
   boolean callbackWithBoolean(in boolean boolParam);
-  [PassThisToCallback=ThisClass] boolean callbackRequiresThisToPass(in Class8 class8Param, in ThisClass thisClassParam);
+  [PassThisToCallback=TestNode] boolean callbackRequiresThisToPass(in long longParam, in TestNode testNodeParam);
 };
index 9587954..959ea1e 100644 (file)
@@ -33,7 +33,7 @@
 enum TestEnumType { "", "EnumValue1", "EnumValue2", "EnumValue3" };
 
 [
-    Constructor(in [Callback] TestCallback testCallback),
+    Constructor(in TestCallback testCallback),
     InterfaceName=TestObject
 ] interface TestObj {
     // Attributes
@@ -143,12 +143,12 @@ enum TestEnumType { "", "EnumValue1", "EnumValue2", "EnumValue3" };
 
 #if defined(TESTING_JS)
     // 'Callback' extended attribute
-    void    methodWithCallbackArg(in [Callback] TestCallback callback);
-    void    methodWithNonCallbackArgAndCallbackArg(in long nonCallback, in [Callback] TestCallback callback);
-    void    methodWithCallbackAndOptionalArg(in [Callback, Optional] TestCallback callback);
+    void    methodWithCallbackArg(in TestCallback callback);
+    void    methodWithNonCallbackArgAndCallbackArg(in long nonCallback, in TestCallback callback);
+    void    methodWithCallbackAndOptionalArg(in [Optional] TestCallback callback);
     // static methods with 'Callback' extended attribute
-    static void    staticMethodWithCallbackAndOptionalArg(in [Callback, Optional] TestCallback callback);
-    static void    staticMethodWithCallbackArg(in [Callback] TestCallback callback);
+    static void    staticMethodWithCallbackAndOptionalArg(in [Optional] TestCallback callback);
+    static void    staticMethodWithCallbackArg(in TestCallback callback);
 #endif
 
     // 'Conditional' extended attribute
@@ -180,7 +180,7 @@ enum TestEnumType { "", "EnumValue1", "EnumValue2", "EnumValue3" };
     void    overloadedMethod(in TestObj? objArg, in [Optional] long longArg);
     void    overloadedMethod(in [StrictTypeChecking] DOMString strArg);
     void    overloadedMethod(in long longArg);
-    void    overloadedMethod(in [Callback] TestCallback callback);
+    void    overloadedMethod(in TestCallback callback);
     void    overloadedMethod(in DOMStringList? listArg);
     void    overloadedMethod(in DOMString[]? arrayArg);
     void    overloadedMethod(in TestObj objArg);
@@ -210,10 +210,10 @@ enum TestEnumType { "", "EnumValue1", "EnumValue2", "EnumValue3" };
     [CheckSecurityForNode] SVGDocument getSVGDocument()
         raises(DOMException);
 
-    void convert1(in [TreatReturnedNullStringAs=Null] a value);
-    void convert2(in [TreatReturnedNullStringAs=Undefined] b value);
-    void convert4(in [TreatNullAs=NullString] d value);
-    void convert5(in [TreatNullAs=NullString, TreatUndefinedAs=NullString] e value);
+    void convert1(in [TreatReturnedNullStringAs=Null] TestNode value);
+    void convert2(in [TreatReturnedNullStringAs=Undefined] TestNode value);
+    void convert4(in [TreatNullAs=NullString] TestNode value);
+    void convert5(in [TreatNullAs=NullString, TreatUndefinedAs=NullString] TestNode value);
 
     attribute SVGPoint mutablePoint;
     [Immutable] attribute SVGPoint immutablePoint;
index 687eac5..a8cf9d2 100644 (file)
 // changes in its ouput.
 [
     Conditional=Condition1|Condition2,
-    Constructor(in DOMString hello, in [TransferList=transferList] SerializedScriptValue data, in [Optional=DefaultIsUndefined] Array transferList),
+    Constructor(in DOMString hello, in [TransferList=transferList] SerializedScriptValue data, in [Optional=DefaultIsUndefined] 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(in [TransferList=transferList] SerializedScriptValue data, in [Optional] Array transferList);
-    void multiTransferList(in [Optional, TransferList=tx] SerializedScriptValue first, in [Optional] Array tx, in [Optional, TransferList=txx] SerializedScriptValue second, in [Optional] Array txx);
+    void acceptTransferList(in [TransferList=transferList] SerializedScriptValue data, in [Optional] Int32Array transferList);
+    void multiTransferList(in [Optional, TransferList=tx] SerializedScriptValue first, in [Optional] Int32Array tx, in [Optional, TransferList=txx] SerializedScriptValue second, in [Optional] Int32Array txx);
 };
index 7851089..c71f2d1 100644 (file)
@@ -74,8 +74,8 @@ typedef SVGPoint                   SVGPOINT;
 typedef DOMString                  STRING;
 typedef [Optional] DOMString       OPTIONAL_STRING;
 typedef DOMString[]                ARRAY_OF_STRINGS;
-typedef [Callback] TestCallback    TEST_CALLBACK;
+typedef TestCallback               TEST_CALLBACK;
 typedef TestSubObjConstructor      T;
-typedef Array                      ARRAY;
+typedef Int32Array                 ARRAY;
 typedef DOMException               E;
 typedef [TransferList=txx] SerializedScriptValue TRANSFER_TXX_SCRIPT_VALUE;
index da296e6..191c04c 100644 (file)
@@ -43,7 +43,7 @@
 
     boolean checkFont(in DOMString font, in [Optional=DefaultIsNullString] DOMString text);
     void loadFont(in Dictionary params);
-    void notifyWhenFontsReady(in [Callback] VoidCallback callback);
+    void notifyWhenFontsReady(in VoidCallback callback);
     readonly attribute boolean loading;
 
     void addEventListener(in DOMString type,
index 7c33893..21b5098 100644 (file)
@@ -35,7 +35,7 @@
     readonly attribute DOMString kind;
     readonly attribute DOMString type;
 
-    void getAsString(in [Callback,Optional=DefaultIsUndefined] StringCallback callback);
+    void getAsString(in [Optional=DefaultIsUndefined] StringCallback callback);
     Blob getAsFile();
 };
 
index a2d9cac..2032d7f 100644 (file)
     void clearInterval(in [Optional=DefaultIsUndefined] long handle);
 
 #if defined(ENABLE_REQUEST_ANIMATION_FRAME) && ENABLE_REQUEST_ANIMATION_FRAME
-    long requestAnimationFrame(in [Callback] RequestAnimationFrameCallback callback);
+    long requestAnimationFrame(in RequestAnimationFrameCallback callback);
     void cancelAnimationFrame(in long id);
-    long webkitRequestAnimationFrame(in [Callback] RequestAnimationFrameCallback callback);
+    long webkitRequestAnimationFrame(in RequestAnimationFrameCallback callback);
     [ImplementedAs=cancelAnimationFrame] void webkitCancelAnimationFrame(in long id);
     [ImplementedAs=cancelAnimationFrame] void webkitCancelRequestAnimationFrame(in long id); // This is a deprecated alias for webkitCancelAnimationFrame(). Remove this when removing vendor prefix.
 #endif