Changeset 65005 in webkit

Timestamp:

Aug 9, 2010 2:36:24 PM (14 years ago)

Author:

dumi@chromium.org

Message:

WebCore: Auto-generate most HTML5 DB bindings.
​https://bugs.webkit.org/show_bug.cgi?id=43382

Reviewed by Adam Barth.

• Android.jscbindings.mk: Remove {JS|V8}Database{Sync}Custom.cpp

and the custom implementations of openDatabase{Sync}().

• Android.v8bindings.mk:
• CMakeLists.txt:
• GNUmakefile.am:
• WebCore.gypi:
• WebCore.pro:
• WebCore.vcproj/WebCore.vcproj:
• WebCore.xcodeproj/project.pbxproj:
• bindings/js/JSBindingsAllInOne.cpp:
• bindings/js/JSDOMWindowCustom.cpp:
• bindings/js/JSDatabaseCustom.cpp: Removed.
• bindings/js/JSDatabaseSyncCustom.cpp: Removed.
• bindings/js/JSWorkerContextCustom.cpp:
• bindings/v8/custom/V8DOMWindowCustom.cpp:
• bindings/v8/custom/V8DatabaseCustom.cpp: Removed.
• bindings/v8/custom/V8DatabaseSyncCustom.cpp: Removed.
• bindings/v8/custom/V8WorkerContextCustom.cpp:

• bindings/scripts/CodeGeneratorGObject.pm: Change the code generators

to check that each value can be converted to the respective
argument type.

• bindings/scripts/CodeGeneratorJS.pm:
• bindings/scripts/CodeGeneratorV8.pm:
• bindings/scripts/test/JS/JSTestCallback.cpp:

(WebCore::JSTestCallback::~JSTestCallback):

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

(WebCore::jsTestObjPrototypeFunctionVoidMethodWithArgs):
(WebCore::jsTestObjPrototypeFunctionIntMethodWithArgs):
(WebCore::jsTestObjPrototypeFunctionObjMethodWithArgs):
(WebCore::jsTestObjPrototypeFunctionMethodThatRequiresAllArgs):
(WebCore::jsTestObjPrototypeFunctionMethodThatRequiresAllArgsAndThrows):
(WebCore::jsTestObjPrototypeFunctionSerializedValue):
(WebCore::jsTestObjPrototypeFunctionIdbKey):
(WebCore::jsTestObjPrototypeFunctionCustomArgsAndException):
(WebCore::jsTestObjPrototypeFunctionWithDynamicFrameAndArg):
(WebCore::jsTestObjPrototypeFunctionWithDynamicFrameAndOptionalArg):
(WebCore::jsTestObjPrototypeFunctionWithDynamicFrameAndUserGesture):
(WebCore::jsTestObjPrototypeFunctionWithDynamicFrameAndUserGestureASAD):
(WebCore::jsTestObjPrototypeFunctionMethodWithOptionalArg):
(WebCore::jsTestObjPrototypeFunctionMethodWithNonOptionalArgAndOptionalArg):
(WebCore::jsTestObjPrototypeFunctionMethodWithNonOptionalArgAndTwoOptionalArgs):
(WebCore::jsTestObjPrototypeFunctionMethodWithCallbackArg):
(WebCore::jsTestObjPrototypeFunctionMethodWithNonCallbackArgAndCallbackArg):
(WebCore::jsTestObjPrototypeFunctionMethodWithCallbackAndOptionalArg):
(WebCore::jsTestObjPrototypeFunctionOverloadedMethod1):
(WebCore::jsTestObjPrototypeFunctionOverloadedMethod2):
(WebCore::jsTestObjPrototypeFunctionOverloadedMethod3):
(WebCore::jsTestObjPrototypeFunctionOverloadedMethod4):

• bindings/scripts/test/V8/V8TestObj.cpp:

(WebCore::TestObjInternal::voidMethodWithArgsCallback):
(WebCore::TestObjInternal::intMethodWithArgsCallback):
(WebCore::TestObjInternal::objMethodWithArgsCallback):
(WebCore::TestObjInternal::methodThatRequiresAllArgsCallback):
(WebCore::TestObjInternal::methodThatRequiresAllArgsAndThrowsCallback):
(WebCore::TestObjInternal::idbKeyCallback):
(WebCore::TestObjInternal::customArgsAndExceptionCallback):
(WebCore::TestObjInternal::withDynamicFrameAndArgCallback):
(WebCore::TestObjInternal::withDynamicFrameAndOptionalArgCallback):
(WebCore::TestObjInternal::withDynamicFrameAndUserGestureCallback):
(WebCore::TestObjInternal::withDynamicFrameAndUserGestureASADCallback):
(WebCore::TestObjInternal::methodWithOptionalArgCallback):
(WebCore::TestObjInternal::methodWithNonOptionalArgAndOptionalArgCallback):
(WebCore::TestObjInternal::methodWithNonOptionalArgAndTwoOptionalArgsCallback):
(WebCore::TestObjInternal::methodWithNonCallbackArgAndCallbackArgCallback):
(WebCore::TestObjInternal::methodWithCallbackAndOptionalArgCallback):
(WebCore::TestObjInternal::overloadedMethod1Callback):
(WebCore::TestObjInternal::overloadedMethod2Callback):
(WebCore::TestObjInternal::overloadedMethod3Callback):
(WebCore::TestObjInternal::overloadedMethod4Callback):
(WebCore::):
(WebCore::ConfigureV8TestObjTemplate):

• bindings/v8/custom/V8BindingMacros.h:

• bindings/v8/V8Binding.h: Minor changes required to support the

auto-generated bindings.
(WebCore::V8Parameter::V8Parameter):

• bindings/v8/custom/V8SQLTransactionCustom.cpp:

(WebCore::V8SQLTransaction::executeSqlCallback):

• bindings/v8/custom/V8SQLTransactionSyncCustom.cpp:

(WebCore::V8SQLTransactionSync::executeSqlCallback):

• page/DOMWindow.idl:
• storage/Database.cpp:

(WebCore::Database::transaction):
(WebCore::Database::readTransaction):
(WebCore::Database::runTransaction):

• storage/Database.h:
• storage/Database.idl:
• storage/DatabaseSync.cpp:

(WebCore::DatabaseSync::transaction):
(WebCore::DatabaseSync::readTransaction):
(WebCore::DatabaseSync::runTransaction):

• storage/DatabaseSync.h:
• storage/DatabaseSync.idl:
• workers/WorkerContext.idl:

LayoutTests: Changing the expected error message for a test.
​https://bugs.webkit.org/show_bug.cgi?id=43382

Reviewed by Adam Barth.

• fast/workers/storage/open-database-inputs-sync-expected.txt:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/workers/storage/open-database-inputs-sync-expected.txt (modified) (1 diff)
• WebCore/Android.jscbindings.mk (modified) (1 diff)
• WebCore/Android.v8bindings.mk (modified) (1 diff)
• WebCore/CMakeLists.txt (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/GNUmakefile.am (modified) (1 diff)
• WebCore/WebCore.gypi (modified) (2 diffs)
• WebCore/WebCore.pro (modified) (1 diff)
• WebCore/WebCore.vcproj/WebCore.vcproj (modified) (1 diff)
• WebCore/WebCore.xcodeproj/project.pbxproj (modified) (6 diffs)
• WebCore/bindings/js/JSBindingsAllInOne.cpp (modified) (1 diff)
• WebCore/bindings/js/JSDOMWindowCustom.cpp (modified) (3 diffs)
• WebCore/bindings/js/JSDatabaseCustom.cpp (deleted)
• WebCore/bindings/js/JSDatabaseSyncCustom.cpp (deleted)
• WebCore/bindings/js/JSWorkerContextCustom.cpp (modified) (2 diffs)
• WebCore/bindings/scripts/CodeGeneratorGObject.pm (modified) (1 diff)
• WebCore/bindings/scripts/CodeGeneratorJS.pm (modified) (8 diffs)
• WebCore/bindings/scripts/CodeGeneratorV8.pm (modified) (5 diffs)
• WebCore/bindings/scripts/test/JS/JSTestCallback.cpp (modified) (1 diff)
• WebCore/bindings/scripts/test/JS/JSTestObj.cpp (modified) (26 diffs)
• WebCore/bindings/scripts/test/V8/V8TestObj.cpp (modified) (25 diffs)
• WebCore/bindings/v8/V8Binding.h (modified) (1 diff)
• WebCore/bindings/v8/custom/V8BindingMacros.h (modified) (1 diff)
• WebCore/bindings/v8/custom/V8DOMWindowCustom.cpp (modified) (3 diffs)
• WebCore/bindings/v8/custom/V8DatabaseCustom.cpp (deleted)
• WebCore/bindings/v8/custom/V8DatabaseSyncCustom.cpp (deleted)
• WebCore/bindings/v8/custom/V8SQLTransactionCustom.cpp (modified) (2 diffs)
• WebCore/bindings/v8/custom/V8SQLTransactionSyncCustom.cpp (modified) (2 diffs)
• WebCore/bindings/v8/custom/V8WorkerContextCustom.cpp (modified) (2 diffs)
• WebCore/page/DOMWindow.idl (modified) (1 diff)
• WebCore/storage/Database.cpp (modified) (1 diff)
• WebCore/storage/Database.h (modified) (2 diffs)
• WebCore/storage/Database.idl (modified) (1 diff)
• WebCore/storage/DatabaseSync.cpp (modified) (1 diff)
• WebCore/storage/DatabaseSync.h (modified) (2 diffs)
• WebCore/storage/DatabaseSync.idl (modified) (1 diff)
• WebCore/workers/WorkerContext.idl (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-08-09  Dumitru Daniliuc  <dumi@chromium.org>
+
+        Reviewed by Adam Barth.
+
+        Changing the expected error message for a test.
+        https://bugs.webkit.org/show_bug.cgi?id=43382
+
+        * fast/workers/storage/open-database-inputs-sync-expected.txt:
+
 2010-08-09  Zhenyao Mo  <zmo@google.com>
 

trunk/LayoutTests/fast/workers/storage/open-database-inputs-sync-expected.txt

@@ -1 +1 @@
 This test makes sure that openDatabaseSync() accepts only valid parameters.
-PASS: SYNTAX_ERR: DOM Exception 12
-PASS: SYNTAX_ERR: DOM Exception 12
+PASS: Not enough arguments
+PASS: Not enough arguments
 PASS: undefined
 PASS: undefined

trunk/WebCore/Android.jscbindings.mk

@@ -91 +91 @@
         bindings/js/JSDataGridColumnListCustom.cpp \
         bindings/js/JSDataGridDataSource.cpp \
-        bindings/js/JSDatabaseCustom.cpp \
         bindings/js/JSDedicatedWorkerContextCustom.cpp \
         bindings/js/JSDesktopNotificationsCustom.cpp \

trunk/WebCore/Android.v8bindings.mk

@@ -107 +107 @@
         bindings/v8/custom/V8DataGridColumnListCustom.cpp \
         bindings/v8/custom/V8DatabaseCallback.cpp \
-        bindings/v8/custom/V8DatabaseCustom.cpp \
         bindings/v8/custom/V8DedicatedWorkerContextCustom.cpp \
         bindings/v8/custom/V8DeviceMotionEventCustom.cpp \

trunk/WebCore/CMakeLists.txt

@@ -591 +591 @@
     bindings/js/JSCustomVoidCallback.cpp
     bindings/js/JSCustomXPathNSResolver.cpp
-    bindings/js/JSDatabaseCustom.cpp
-    bindings/js/JSDatabaseCustom.cpp
-    bindings/js/JSDatabaseSyncCustom.cpp
     bindings/js/JSDataGridColumnListCustom.cpp
     bindings/js/JSDataGridDataSource.cpp

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-08-09  Dumitru Daniliuc  <dumi@chromium.org>
+
+        Reviewed by Adam Barth.
+
+        Auto-generate most HTML5 DB bindings.
+        https://bugs.webkit.org/show_bug.cgi?id=43382
+
+        * Android.jscbindings.mk: Remove {JS|V8}Database{Sync}Custom.cpp
+        and the custom implementations of openDatabase{Sync}().
+        * Android.v8bindings.mk:
+        * CMakeLists.txt:
+        * GNUmakefile.am:
+        * WebCore.gypi:
+        * WebCore.pro:
+        * WebCore.vcproj/WebCore.vcproj:
+        * WebCore.xcodeproj/project.pbxproj:
+        * bindings/js/JSBindingsAllInOne.cpp:
+        * bindings/js/JSDOMWindowCustom.cpp:
+        * bindings/js/JSDatabaseCustom.cpp: Removed.
+        * bindings/js/JSDatabaseSyncCustom.cpp: Removed.
+        * bindings/js/JSWorkerContextCustom.cpp:
+        * bindings/v8/custom/V8DOMWindowCustom.cpp:
+        * bindings/v8/custom/V8DatabaseCustom.cpp: Removed.
+        * bindings/v8/custom/V8DatabaseSyncCustom.cpp: Removed.
+        * bindings/v8/custom/V8WorkerContextCustom.cpp:
+
+        * bindings/scripts/CodeGeneratorGObject.pm: Change the code generators
+        to check that each value can be converted to the respective
+        argument type.
+        * bindings/scripts/CodeGeneratorJS.pm:
+        * bindings/scripts/CodeGeneratorV8.pm:
+        * bindings/scripts/test/JS/JSTestCallback.cpp:
+        (WebCore::JSTestCallback::~JSTestCallback):
+        * bindings/scripts/test/JS/JSTestObj.cpp:
+        (WebCore::jsTestObjPrototypeFunctionVoidMethodWithArgs):
+        (WebCore::jsTestObjPrototypeFunctionIntMethodWithArgs):
+        (WebCore::jsTestObjPrototypeFunctionObjMethodWithArgs):
+        (WebCore::jsTestObjPrototypeFunctionMethodThatRequiresAllArgs):
+        (WebCore::jsTestObjPrototypeFunctionMethodThatRequiresAllArgsAndThrows):
+        (WebCore::jsTestObjPrototypeFunctionSerializedValue):
+        (WebCore::jsTestObjPrototypeFunctionIdbKey):
+        (WebCore::jsTestObjPrototypeFunctionCustomArgsAndException):
+        (WebCore::jsTestObjPrototypeFunctionWithDynamicFrameAndArg):
+        (WebCore::jsTestObjPrototypeFunctionWithDynamicFrameAndOptionalArg):
+        (WebCore::jsTestObjPrototypeFunctionWithDynamicFrameAndUserGesture):
+        (WebCore::jsTestObjPrototypeFunctionWithDynamicFrameAndUserGestureASAD):
+        (WebCore::jsTestObjPrototypeFunctionMethodWithOptionalArg):
+        (WebCore::jsTestObjPrototypeFunctionMethodWithNonOptionalArgAndOptionalArg):
+        (WebCore::jsTestObjPrototypeFunctionMethodWithNonOptionalArgAndTwoOptionalArgs):
+        (WebCore::jsTestObjPrototypeFunctionMethodWithCallbackArg):
+        (WebCore::jsTestObjPrototypeFunctionMethodWithNonCallbackArgAndCallbackArg):
+        (WebCore::jsTestObjPrototypeFunctionMethodWithCallbackAndOptionalArg):
+        (WebCore::jsTestObjPrototypeFunctionOverloadedMethod1):
+        (WebCore::jsTestObjPrototypeFunctionOverloadedMethod2):
+        (WebCore::jsTestObjPrototypeFunctionOverloadedMethod3):
+        (WebCore::jsTestObjPrototypeFunctionOverloadedMethod4):
+        * bindings/scripts/test/V8/V8TestObj.cpp:
+        (WebCore::TestObjInternal::voidMethodWithArgsCallback):
+        (WebCore::TestObjInternal::intMethodWithArgsCallback):
+        (WebCore::TestObjInternal::objMethodWithArgsCallback):
+        (WebCore::TestObjInternal::methodThatRequiresAllArgsCallback):
+        (WebCore::TestObjInternal::methodThatRequiresAllArgsAndThrowsCallback):
+        (WebCore::TestObjInternal::idbKeyCallback):
+        (WebCore::TestObjInternal::customArgsAndExceptionCallback):
+        (WebCore::TestObjInternal::withDynamicFrameAndArgCallback):
+        (WebCore::TestObjInternal::withDynamicFrameAndOptionalArgCallback):
+        (WebCore::TestObjInternal::withDynamicFrameAndUserGestureCallback):
+        (WebCore::TestObjInternal::withDynamicFrameAndUserGestureASADCallback):
+        (WebCore::TestObjInternal::methodWithOptionalArgCallback):
+        (WebCore::TestObjInternal::methodWithNonOptionalArgAndOptionalArgCallback):
+        (WebCore::TestObjInternal::methodWithNonOptionalArgAndTwoOptionalArgsCallback):
+        (WebCore::TestObjInternal::methodWithNonCallbackArgAndCallbackArgCallback):
+        (WebCore::TestObjInternal::methodWithCallbackAndOptionalArgCallback):
+        (WebCore::TestObjInternal::overloadedMethod1Callback):
+        (WebCore::TestObjInternal::overloadedMethod2Callback):
+        (WebCore::TestObjInternal::overloadedMethod3Callback):
+        (WebCore::TestObjInternal::overloadedMethod4Callback):
+        (WebCore::):
+        (WebCore::ConfigureV8TestObjTemplate):
+        * bindings/v8/custom/V8BindingMacros.h:
+
+        * bindings/v8/V8Binding.h: Minor changes required to support the
+        auto-generated bindings.
+        (WebCore::V8Parameter::V8Parameter):
+        * bindings/v8/custom/V8SQLTransactionCustom.cpp:
+        (WebCore::V8SQLTransaction::executeSqlCallback):
+        * bindings/v8/custom/V8SQLTransactionSyncCustom.cpp:
+        (WebCore::V8SQLTransactionSync::executeSqlCallback):
+        * page/DOMWindow.idl:
+        * storage/Database.cpp:
+        (WebCore::Database::transaction):
+        (WebCore::Database::readTransaction):
+        (WebCore::Database::runTransaction):
+        * storage/Database.h:
+        * storage/Database.idl:
+        * storage/DatabaseSync.cpp:
+        (WebCore::DatabaseSync::transaction):
+        (WebCore::DatabaseSync::readTransaction):
+        (WebCore::DatabaseSync::runTransaction):
+        * storage/DatabaseSync.h:
+        * storage/DatabaseSync.idl:
+        * workers/WorkerContext.idl:
+
 2010-08-09  Adam Barth  <abarth@webkit.org>
 

trunk/WebCore/GNUmakefile.am

@@ -2744 +2744 @@
 webcore_sources += \
         WebCore/bindings/js/JSCustomSQLStatementErrorCallback.cpp \
-        WebCore/bindings/js/JSDatabaseCustom.cpp \
-        WebCore/bindings/js/JSDatabaseSyncCustom.cpp \
         WebCore/bindings/js/JSSQLResultSetRowListCustom.cpp \
         WebCore/bindings/js/JSSQLTransactionCustom.cpp \

trunk/WebCore/WebCore.gypi

@@ -544 +544 @@
             'bindings/js/JSCustomXPathNSResolver.cpp',
             'bindings/js/JSCustomXPathNSResolver.h',
-            'bindings/js/JSDatabaseCustom.cpp',
-            'bindings/js/JSDatabaseSyncCustom.cpp',
             'bindings/js/JSDataGridColumnListCustom.cpp',
             'bindings/js/JSDataGridDataSource.cpp',
@@ -743 +741 @@
             'bindings/v8/custom/V8CustomXPathNSResolver.cpp',
             'bindings/v8/custom/V8CustomXPathNSResolver.h',
-            'bindings/v8/custom/V8DatabaseCustom.cpp',
-            'bindings/v8/custom/V8DatabaseSyncCustom.cpp',
             'bindings/v8/custom/V8DataGridColumnListCustom.cpp',
             'bindings/v8/custom/V8DedicatedWorkerContextCustom.cpp',

trunk/WebCore/WebCore.pro

@@ -2426 +2426 @@
         storage/SQLTransactionSync.cpp \
         bindings/js/JSCustomSQLStatementErrorCallback.cpp \
-        bindings/js/JSDatabaseCustom.cpp \
-        bindings/js/JSDatabaseSyncCustom.cpp \
         bindings/js/JSSQLResultSetRowListCustom.cpp \
         bindings/js/JSSQLTransactionCustom.cpp \

trunk/WebCore/WebCore.vcproj/WebCore.vcproj

@@ -42181 +42181 @@
                                 </File>
                                 <File
-                                        RelativePath="..\bindings\js\JSDatabaseCustom.cpp"
-                                        >
-                                        <FileConfiguration
-                                                Name="Debug|Win32"
-                                                ExcludedFromBuild="true"
-                                                >
-                                                <Tool
-                                                        Name="VCCLCompilerTool"
-                                                />
-                                        </FileConfiguration>
-                                        <FileConfiguration
-                                                Name="Release|Win32"
-                                                ExcludedFromBuild="true"
-                                                >
-                                                <Tool
-                                                        Name="VCCLCompilerTool"
-                                                />
-                                        </FileConfiguration>
-                                        <FileConfiguration
-                                                Name="Debug_Internal|Win32"
-                                                ExcludedFromBuild="true"
-                                                >
-                                                <Tool
-                                                        Name="VCCLCompilerTool"
-                                                />
-                                        </FileConfiguration>
-                                        <FileConfiguration
-                                                Name="Debug_Cairo|Win32"
-                                                ExcludedFromBuild="true"
-                                                >
-                                                <Tool
-                                                        Name="VCCLCompilerTool"
-                                                />
-                                        </FileConfiguration>
-                                        <FileConfiguration
-                                                Name="Release_Cairo|Win32"
-                                                ExcludedFromBuild="true"
-                                                >
-                                                <Tool
-                                                        Name="VCCLCompilerTool"
-                                                />
-                                        </FileConfiguration>
-                                        <FileConfiguration
-                                                Name="Debug_All|Win32"
-                                                ExcludedFromBuild="true"
-                                                >
-                                                <Tool
-                                                        Name="VCCLCompilerTool"
-                                                />
-                                        </FileConfiguration>
-                                </File>
-                                <File
-                                        RelativePath="..\bindings\js\JSDatabaseSyncCustom.cpp"
-                                        >
-                                        <FileConfiguration
-                                                Name="Debug|Win32"
-                                                ExcludedFromBuild="true"
-                                                >
-                                                <Tool
-                                                        Name="VCCLCompilerTool"
-                                                />
-                                        </FileConfiguration>
-                                        <FileConfiguration
-                                                Name="Release|Win32"
-                                                ExcludedFromBuild="true"
-                                                >
-                                                <Tool
-                                                        Name="VCCLCompilerTool"
-                                                />
-                                        </FileConfiguration>
-                                        <FileConfiguration
-                                                Name="Debug_Internal|Win32"
-                                                ExcludedFromBuild="true"
-                                                >
-                                                <Tool
-                                                        Name="VCCLCompilerTool"
-                                                />
-                                        </FileConfiguration>
-                                        <FileConfiguration
-                                                Name="Debug_Cairo|Win32"
-                                                ExcludedFromBuild="true"
-                                                >
-                                                <Tool
-                                                        Name="VCCLCompilerTool"
-                                                />
-                                        </FileConfiguration>
-                                        <FileConfiguration
-                                                Name="Release_Cairo|Win32"
-                                                ExcludedFromBuild="true"
-                                                >
-                                                <Tool
-                                                        Name="VCCLCompilerTool"
-                                                />
-                                        </FileConfiguration>
-                                        <FileConfiguration
-                                                Name="Debug_All|Win32"
-                                                ExcludedFromBuild="true"
-                                                >
-                                                <Tool
-                                                        Name="VCCLCompilerTool"
-                                                />
-                                        </FileConfiguration>
-                                </File>
-                                <File
                                         RelativePath="..\bindings\js\JSDataGridColumnListCustom.cpp"
                                         >

trunk/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -4365 +4365 @@
                 B55D5AA4119131FC00BCC315 /* JSSQLTransactionSyncCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = B55D5AA2119131FC00BCC315 /* JSSQLTransactionSyncCallback.h */; };
                 B55D5AA5119131FC00BCC315 /* JSSQLTransactionSyncCallback.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B55D5AA3119131FC00BCC315 /* JSSQLTransactionSyncCallback.cpp */; };
-                B55D5AA81191325000BCC315 /* JSDatabaseSyncCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B55D5AA61191325000BCC315 /* JSDatabaseSyncCustom.cpp */; };
                 B55D5AA91191325000BCC315 /* JSSQLTransactionSyncCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B55D5AA71191325000BCC315 /* JSSQLTransactionSyncCustom.cpp */; };
                 B56EBA8511C9FF8100B04477 /* SQLException.h in Headers */ = {isa = PBXBuildFile; fileRef = B56EBA8311C9FF8100B04477 /* SQLException.h */; };
@@ -4823 +4822 @@
                 BCCD74DC0A4C8D35005FDA6D /* HTMLViewSourceDocument.h in Headers */ = {isa = PBXBuildFile; fileRef = BCCD74DB0A4C8D35005FDA6D /* HTMLViewSourceDocument.h */; };
                 BCCD74E50A4C8DDF005FDA6D /* HTMLViewSourceDocument.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCCD74E40A4C8DDF005FDA6D /* HTMLViewSourceDocument.cpp */; };
-                BCCE58AC1061E8CF008FB35A /* JSDatabaseCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCCE58AB1061E8CF008FB35A /* JSDatabaseCustom.cpp */; };
                 BCCFBAE80B5152ED0001F1D7 /* DocumentParser.h in Headers */ = {isa = PBXBuildFile; fileRef = BCCFBAE70B5152ED0001F1D7 /* DocumentParser.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 BCD0E0FA0E972C3500265DEA /* SecurityOrigin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCD0E0F70E972C3500265DEA /* SecurityOrigin.cpp */; };
@@ -10066 +10064 @@
                 B55D5AA2119131FC00BCC315 /* JSSQLTransactionSyncCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSSQLTransactionSyncCallback.h; sourceTree = "<group>"; };
                 B55D5AA3119131FC00BCC315 /* JSSQLTransactionSyncCallback.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSSQLTransactionSyncCallback.cpp; sourceTree = "<group>"; };
-                B55D5AA61191325000BCC315 /* JSDatabaseSyncCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSDatabaseSyncCustom.cpp; sourceTree = "<group>"; };
                 B55D5AA71191325000BCC315 /* JSSQLTransactionSyncCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSSQLTransactionSyncCustom.cpp; sourceTree = "<group>"; };
                 B55D5ABB1191327200BCC315 /* DatabaseSync.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = DatabaseSync.idl; sourceTree = "<group>"; };
@@ -10561 +10558 @@
                 BCCD74DB0A4C8D35005FDA6D /* HTMLViewSourceDocument.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = HTMLViewSourceDocument.h; sourceTree = "<group>"; };
                 BCCD74E40A4C8DDF005FDA6D /* HTMLViewSourceDocument.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = HTMLViewSourceDocument.cpp; sourceTree = "<group>"; };
-                BCCE58AB1061E8CF008FB35A /* JSDatabaseCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSDatabaseCustom.cpp; sourceTree = "<group>"; };
                 BCCFBAE70B5152ED0001F1D7 /* DocumentParser.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DocumentParser.h; sourceTree = "<group>"; };
                 BCD0E0F70E972C3500265DEA /* SecurityOrigin.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SecurityOrigin.cpp; sourceTree = "<group>"; };
@@ -16027 +16023 @@
                                 BC5825F20C0B89380053F1B5 /* JSCSSStyleDeclarationCustom.cpp */,
                                 BC20FB7E0C0E8E6C00D1447F /* JSCSSValueCustom.cpp */,
-                                BCCE58AB1061E8CF008FB35A /* JSDatabaseCustom.cpp */,
-                                B55D5AA61191325000BCC315 /* JSDatabaseSyncCustom.cpp */,
                                 BC77D1510FF19C730070887B /* JSDataGridColumnListCustom.cpp */,
                                 4162A453101145E300DFF3ED /* JSDedicatedWorkerContextCustom.cpp */,
@@ -21321 +21315 @@
                                 1AE82F8F0CAAFA9D002237AE /* JSDatabase.cpp in Sources */,
                                 B59DD69A119029E5007E9684 /* JSDatabaseCallback.cpp in Sources */,
-                                BCCE58AC1061E8CF008FB35A /* JSDatabaseCustom.cpp in Sources */,
                                 B58CEB6A11913607002A6790 /* JSDatabaseSync.cpp in Sources */,
-                                B55D5AA81191325000BCC315 /* JSDatabaseSyncCustom.cpp in Sources */,
                                 BC77D1690FF19F560070887B /* JSDataGridColumn.cpp in Sources */,
                                 BC77D16B0FF19F560070887B /* JSDataGridColumnList.cpp in Sources */,

trunk/WebCore/bindings/js/JSBindingsAllInOne.cpp

@@ -58 +58 @@
 #include "JSDataGridColumnListCustom.cpp"
 #include "JSDataGridDataSource.cpp"
-#include "JSDatabaseCustom.cpp"
-#include "JSDatabaseSyncCustom.cpp"
 #include "JSDebugWrapperSet.cpp"
 #include "JSDedicatedWorkerContextCustom.cpp"

trunk/WebCore/bindings/js/JSDOMWindowCustom.cpp

@@ -23 +23 @@
 #include "AtomicString.h"
 #include "Chrome.h"
-#include "Database.h"
 #include "DOMWindow.h"
 #include "Document.h"
@@ -37 +36 @@
 #include "History.h"
 #include "JSAudioConstructor.h"
-#if ENABLE(DATABASE)
-#include "JSDatabase.h"
-#include "JSDatabaseCallback.h"
-#endif
 #include "JSDOMWindowShell.h"
 #include "JSEvent.h"
@@ -1007 +1002 @@
 }
 
-#if ENABLE(DATABASE)
-JSValue JSDOMWindow::openDatabase(ExecState* exec)
-{
-    if (!allowsAccessFrom(exec) || (exec->argumentCount() < 4)) {
-        setDOMException(exec, SYNTAX_ERR);
-        return jsUndefined();
-    }
-
-    String name = ustringToString(exec->argument(0).toString(exec));
-    if (exec->hadException())
-        return jsUndefined();
-
-    String version = ustringToString(exec->argument(1).toString(exec));
-    if (exec->hadException())
-        return jsUndefined();
-
-    String displayName = ustringToString(exec->argument(2).toString(exec));
-    if (exec->hadException())
-        return jsUndefined();
-
-    // exec->argument(3) = estimated size
-    unsigned long estimatedSize = exec->argument(3).toUInt32(exec);
-    if (exec->hadException())
-        return jsUndefined();
-
-    RefPtr<DatabaseCallback> creationCallback;
-    if (exec->argumentCount() >= 5) {
-        if (!exec->argument(4).isObject()) {
-            setDOMException(exec, TYPE_MISMATCH_ERR);
-            return jsUndefined();
-        }
-
-        creationCallback = JSDatabaseCallback::create(asObject(exec->argument(4)), globalObject());
-    }
-
-    ExceptionCode ec = 0;
-    JSValue result = toJS(exec, globalObject(), WTF::getPtr(impl()->openDatabase(name, version, displayName, estimatedSize, creationCallback.release(), ec)));
-
-    setDOMException(exec, ec);
-    return result;
-}
-#endif
-
 DOMWindow* toDOMWindow(JSValue value)
 {

trunk/WebCore/bindings/js/JSWorkerContextCustom.cpp

@@ -30 +30 @@
 #include "JSWorkerContext.h"
 
-#if ENABLE(DATABASE)
-#include "Database.h"
-#include "DatabaseSync.h"
-#include "JSDatabase.h"
-#include "JSDatabaseCallback.h"
-#include "JSDatabaseSync.h"
-#endif
 #include "ExceptionCode.h"
 #include "JSDOMBinding.h"
@@ -154 +147 @@
 #endif
 
-#if ENABLE(DATABASE)
-JSValue JSWorkerContext::openDatabase(ExecState* exec) 
-{ 
-    if (exec->argumentCount() < 4) {
-        setDOMException(exec, SYNTAX_ERR);
-        return jsUndefined();
-    }
-
-    String name = ustringToString(exec->argument(0).toString(exec));
-    if (exec->hadException())
-        return jsUndefined();
-
-    String version = ustringToString(exec->argument(1).toString(exec));
-    if (exec->hadException())
-        return jsUndefined();
-
-    String displayName = ustringToString(exec->argument(2).toString(exec));
-    if (exec->hadException())
-        return jsUndefined();
-
-    // exec->argument(3) = estimated size
-    unsigned long estimatedSize = exec->argument(3).toUInt32(exec);
-    if (exec->hadException())
-        return jsUndefined();
-
-    RefPtr<DatabaseCallback> creationCallback;
-    if (exec->argumentCount() >= 5) {
-        if (!exec->argument(4).isObject()) {
-            setDOMException(exec, TYPE_MISMATCH_ERR);
-            return jsUndefined();
-        }
-
-        creationCallback = JSDatabaseCallback::create(asObject(exec->argument(4)), globalObject());
-    }
- 
-    ExceptionCode ec = 0; 
-    JSValue result = toJS(exec, globalObject(), WTF::getPtr(impl()->openDatabase(name, version, displayName, estimatedSize, creationCallback.release(), ec))); 
-    setDOMException(exec, ec); 
-    return result; 
-} 
- 
-JSValue JSWorkerContext::openDatabaseSync(ExecState* exec)
-{
-    if (exec->argumentCount() < 4) {
-        setDOMException(exec, SYNTAX_ERR);
-        return jsUndefined();
-    }
-
-    String name = ustringToString(exec->argument(0).toString(exec));
-    if (exec->hadException())
-        return jsUndefined();
-
-    String version = ustringToString(exec->argument(1).toString(exec));
-    if (exec->hadException())
-        return jsUndefined();
-
-    String displayName = ustringToString(exec->argument(2).toString(exec));
-    if (exec->hadException())
-        return jsUndefined();
-
-    // exec->argument(3) = estimated size
-    unsigned long estimatedSize = exec->argument(3).toUInt32(exec);
-    if (exec->hadException())
-        return jsUndefined();
-
-    RefPtr<DatabaseCallback> creationCallback;
-    if (exec->argumentCount() >= 5) {
-        if (!exec->argument(4).isObject()) {
-            setDOMException(exec, TYPE_MISMATCH_ERR);
-            return jsUndefined();
-        }
-
-        creationCallback = JSDatabaseCallback::create(asObject(exec->argument(4)), globalObject());
-    }
-
-    ExceptionCode ec = 0;
-    JSValue result = toJS(exec, globalObject(), WTF::getPtr(impl()->openDatabaseSync(name, version, displayName, estimatedSize, creationCallback.release(), ec)));
-
-    setDOMException(exec, ec);
-    return result;
-}
-#endif
-
 } // namespace WebCore
 

trunk/WebCore/bindings/scripts/CodeGeneratorGObject.pm

@@ -209 +209 @@
     }
 
+    # Skip functions that have ["Callback"] parameters, because this
+    # code generator doesn't know how to auto-generate callbacks.
+    foreach my $param (@{$function->parameters}) {
+        if ($param->extendedAttributes->{"Callback"}) {
+            return 1;
+        }
+    }
+
     return 0;
 }

trunk/WebCore/bindings/scripts/CodeGeneratorJS.pm

@@ -1854 +1854 @@
                 my $requiresAllArguments = $function->signature->extendedAttributes->{"RequiresAllArguments"};
                 if ($requiresAllArguments) {
-                        push(@implContent, "    if (exec->argumentCount() < $numParameters)\n");
-                        if ($requiresAllArguments eq "Raise") {
-                            push(@implContent, "        return throwVMError(exec, createSyntaxError(exec, \"Not enough arguments\"));\n");
+                    my $numMandatoryParams = @{$function->parameters};
+                    foreach my $param (reverse(@{$function->parameters})) {
+                        if ($param->extendedAttributes->{"Optional"}) {
+                            $numMandatoryParams--;
                         } else {
-                            push(@implContent, "        return JSValue::encode(jsUndefined());\n");
+                            last;
                         }
+                    }
+                    push(@implContent, "    if (exec->argumentCount() < $numMandatoryParams)\n");
+                    if ($requiresAllArguments eq "Raise") {
+                        push(@implContent, "        return throwVMError(exec, createSyntaxError(exec, \"Not enough arguments\"));\n");
+                    } else {
+                        push(@implContent, "        return JSValue::encode(jsUndefined());\n");
+                    }
                 }
 
@@ -1909 +1917 @@
                     }
 
+                    $implIncludes{"ExceptionCode.h"} = 1;
+                    $implIncludes{"JSDOMBinding.h"} = 1;
                     foreach my $parameter (@{$function->parameters}) {
-                        if ($parameter->extendedAttributes->{"Optional"}) {
+                        # Optional callbacks should be treated differently, because they always have a default value (0),
+                        # and we can reduce the number of overloaded functions that take a different number of parameters.
+                        if ($parameter->extendedAttributes->{"Optional"} && !$parameter->extendedAttributes->{"Callback"}) {
                             # Generate early call if there are enough parameters.
                             if (!$hasOptionalArguments) {
@@ -1916 +1928 @@
                                 $hasOptionalArguments = 1;
                             }
-                            push(@implContent, "    if (argsCount < " . ($argsIndex + 1) . ") {\n");
+                            push(@implContent, "    if (argsCount <= $argsIndex) {\n");
                             GenerateImplementationFunctionCall($function, $functionString, $paramIndex, "    " x 2, $podType, $implClassName);
                             push(@implContent, "    }\n\n");
@@ -1935 +1947 @@
                             my $callbackClassName = GetCallbackClassName($parameter->type);
                             $implIncludes{"$callbackClassName.h"} = 1;
-                            $implIncludes{"ExceptionCode.h"} = 1;
-                            push(@implContent, "    if (exec->argumentCount() <= $argsIndex || !exec->argument($argsIndex).isObject()) {\n");
-                            push(@implContent, "        setDOMException(exec, TYPE_MISMATCH_ERR);\n");
-                            push(@implContent, "        return jsUndefined();\n");
-                            push(@implContent, "    }\n");
-                            push(@implContent, "    RefPtr<" . $parameter->type . "> $name = " . $callbackClassName . "::create(asObject(exec->argument($argsIndex)), castedThis->globalObject());\n");
+                            if ($parameter->extendedAttributes->{"Optional"}) {
+                                push(@implContent, "    RefPtr<" . $parameter->type. "> $name;\n");
+                                push(@implContent, "    if (exec->argumentCount() > $argsIndex && !exec->argument($argsIndex).isNull() && !exec->argument($argsIndex).isUndefined()) {\n");
+                                push(@implContent, "        if (!exec->argument($argsIndex).isObject()) {\n");
+                                push(@implContent, "            setDOMException(exec, TYPE_MISMATCH_ERR);\n");
+                                push(@implContent, "            return JSValue::encode(jsUndefined());\n");
+                                push(@implContent, "        }\n");
+                                push(@implContent, "        $name = ${callbackClassName}::create(asObject(exec->argument($argsIndex)), castedThis->globalObject());\n");
+                                push(@implContent, "    }\n");
+                            } else {
+                                push(@implContent, "    if (exec->argumentCount() <= $argsIndex || !exec->argument($argsIndex).isObject()) {\n");
+                                push(@implContent, "        setDOMException(exec, TYPE_MISMATCH_ERR);\n");
+                                push(@implContent, "        return JSValue::encode(jsUndefined());\n");
+                                push(@implContent, "    }\n");
+                                push(@implContent, "    RefPtr<" . $parameter->type . "> $name = ${callbackClassName}::create(asObject(exec->argument($argsIndex)), castedThis->globalObject());\n");
+                            }
                         } else {
                             push(@implContent, "    " . GetNativeTypeFromSignature($parameter) . " $name = " . JSValueToNative($parameter, "exec->argument($argsIndex)") . ";\n");
@@ -1948 +1970 @@
                             # was negative will be lost by the time we're inside the DOM.
                             if ($parameter->extendedAttributes->{"IsIndex"}) {
-                                $implIncludes{"ExceptionCode.h"} = 1;
                                 push(@implContent, "    if ($name < 0) {\n");
                                 push(@implContent, "        setDOMException(exec, INDEX_SIZE_ERR);\n");
@@ -1954 +1975 @@
                                 push(@implContent, "    }\n");
                             }
+
+                            # Check if the type conversion succeeded.
+                            push(@implContent, "    if (exec->hadException())\n");
+                            push(@implContent, "        return JSValue::encode(jsUndefined());\n");
                         }
 
@@ -2172 +2197 @@
     push(@implContent, "    ScriptExecutionContext* context = scriptExecutionContext();\n");
     push(@implContent, "    // When the context is destroyed, all tasks with a reference to a callback\n");
-    push(@implContent, "    // should be deleted. So if the context is NULL, we are on the context thread.\n");
+    push(@implContent, "    // should be deleted. So if the context is 0, we are on the context thread.\n");
     push(@implContent, "    if (!context || context->isContextThread())\n");
     push(@implContent, "        delete m_data;\n");
@@ -2344 +2369 @@
     return "$value.toNumber(exec)" if $type eq "double";
     return "$value.toFloat(exec)" if $type eq "float" or $type eq "SVGNumber";
-    return "$value.toInt32(exec)" if $type eq "unsigned long" or $type eq "long" or $type eq "unsigned short";
+    return "$value.toInt32(exec)" if $type eq "long";
+    return "$value.toUInt32(exec)" if $type eq "unsigned long" or $type eq "unsigned short";
     return "static_cast<$type>($value.toInteger(exec))" if $type eq "long long" or $type eq "unsigned long long";
 

trunk/WebCore/bindings/scripts/CodeGeneratorV8.pm

@@ -1107 +1107 @@
     my $requiresAllArguments = $function->signature->extendedAttributes->{"RequiresAllArguments"};
     if ($requiresAllArguments) {
-        push(@implContentDecls, "    if (args.Length() < $numParameters)\n");
+        my $numMandatoryParams = @{$function->parameters};
+        foreach my $param (reverse(@{$function->parameters})) {
+            if ($param->extendedAttributes->{"Optional"}) {
+                $numMandatoryParams--;
+            } else {
+                last;
+            }
+        }
+        push(@implContentDecls, "    if (args.Length() < $numMandatoryParams)\n");
         if ($requiresAllArguments eq "Raise") {
             push(@implContentDecls, "        return throwError(\"Not enough arguments\", V8Proxy::SyntaxError);\n");
@@ -1176 +1184 @@
         my $parameterName = $parameter->name;
 
-        if ($parameter->extendedAttributes->{"Optional"}) {
+        # Optional callbacks should be treated differently, because they always have a default value (0),
+        # and we can reduce the number of overloaded functions that take a different number of parameters.
+        if ($parameter->extendedAttributes->{"Optional"} && !$parameter->extendedAttributes->{"Callback"}) {
             # Generate early call if there are not enough parameters.
             push(@implContentDecls, "    if (args.Length() <= $paramIndex) {\n");
@@ -1184 +1194 @@
         }
 
+        if (BasicTypeCanFailConversion($parameter)) {
+            push(@implContentDecls, "    bool ${parameterName}Ok;\n");
+        }
+
+        $implIncludes{"ExceptionCode.h"} = 1;
+        my $nativeType = GetNativeTypeFromSignature($parameter, $paramIndex);
         if ($parameter->extendedAttributes->{"Callback"}) {
             my $className = GetCallbackClassName($parameter->type);
             $implIncludes{"$className.h"} = 1;
-            $implIncludes{"ExceptionCode.h"} = 1;
-            push(@implContentDecls, "    if (args.Length() <= $paramIndex || !args[$paramIndex]->IsObject())\n");
-            push(@implContentDecls, "        return throwError(TYPE_MISMATCH_ERR);\n");
-            push(@implContentDecls, "    RefPtr<" . $parameter->type . "> $parameterName = ${className}::create(args[$paramIndex], getScriptExecutionContext());\n");
-            $paramIndex++;
-            next;
-        }
-
-        if ($parameter->type eq "SerializedScriptValue") {
+            if ($parameter->extendedAttributes->{"Optional"}) {
+                push(@implContentDecls, "    RefPtr<" . $parameter->type . "> $parameterName;\n");
+                push(@implContentDecls, "    if (args.Length() > $paramIndex && !args[$paramIndex]->IsNull() && !args[$paramIndex]->IsUndefined()) {\n");
+                push(@implContentDecls, "        if (!args[$paramIndex]->IsObject())\n");
+                push(@implContentDecls, "            return throwError(TYPE_MISMATCH_ERR);\n");
+                push(@implContentDecls, "        $parameterName = ${className}::create(args[$paramIndex], getScriptExecutionContext());\n");
+                push(@implContentDecls, "    }\n");
+            } else {
+                push(@implContentDecls, "    if (args.Length() <= $paramIndex || !args[$paramIndex]->IsObject())\n");
+                push(@implContentDecls, "        return throwError(TYPE_MISMATCH_ERR);\n");
+                push(@implContentDecls, "    RefPtr<" . $parameter->type . "> $parameterName = ${className}::create(args[$paramIndex], getScriptExecutionContext());\n");
+            }
+        } elsif ($parameter->type eq "SerializedScriptValue") {
             $implIncludes{"SerializedScriptValue.h"} = 1;
             push(@implContentDecls, "    bool ${parameterName}DidThrow = false;\n");
-        } elsif (BasicTypeCanFailConversion($parameter)) {
-            push(@implContentDecls, "    bool ${parameterName}Ok;\n");
-        }
-
-        push(@implContentDecls, "    " . GetNativeTypeFromSignature($parameter, $paramIndex) . " $parameterName = ");
-
-        if ($parameter->type eq "SerializedScriptValue") {
-            push(@implContentDecls, "SerializedScriptValue::create(args[$paramIndex], ${parameterName}DidThrow);\n");
+            push(@implContentDecls, "    $nativeType $parameterName = SerializedScriptValue::create(args[$paramIndex], ${parameterName}DidThrow);\n");
             push(@implContentDecls, "    if (${parameterName}DidThrow)\n");
             push(@implContentDecls, "        return v8::Undefined();\n");
+        } elsif (TypeCanFailConversion($parameter)) {
+            push(@implContentDecls, "    $nativeType $parameterName = " .
+                 JSValueToNative($parameter, "args[$paramIndex]", BasicTypeCanFailConversion($parameter) ?  "${parameterName}Ok" : undef) . ";\n");
+            push(@implContentDecls, "    if (UNLIKELY(!$parameterName" . (BasicTypeCanFailConversion($parameter) ? "Ok" : "") . ")) {\n");
+            push(@implContentDecls, "        ec = TYPE_MISMATCH_ERR;\n");
+            push(@implContentDecls, "        goto fail;\n");
+            push(@implContentDecls, "    }\n");
+        } elsif ($nativeType =~ /^V8Parameter/) {
+            my $value = JSValueToNative($parameter, "args[$paramIndex]", BasicTypeCanFailConversion($parameter) ?  "${parameterName}Ok" : undef);
+            if ($parameter->type eq "DOMString") {
+                push(@implContentDecls, "    STRING_TO_V8PARAMETER_EXCEPTION_BLOCK($nativeType, $parameterName, $value);\n");
+            } else {
+                # Don't know how to properly check for conversion exceptions when $parameter->type is "DOMUserData"
+                push(@implContentDecls, "    $nativeType $parameterName = $value;\n");
+            }
         } else {
-            push(@implContentDecls, JSValueToNative($parameter, "args[$paramIndex]",
-                                                    BasicTypeCanFailConversion($parameter) ?  "${parameterName}Ok" : undef) . ";\n");
-        }
-
-        if (TypeCanFailConversion($parameter)) {
-            $implIncludes{"ExceptionCode.h"} = 1;
-            push(@implContentDecls,
-"    if (UNLIKELY(!$parameterName" . (BasicTypeCanFailConversion($parameter) ? "Ok" : "") . ")) {\n" .
-"        ec = TYPE_MISMATCH_ERR;\n" .
-"        goto fail;\n" .
-"    }\n");
+            $implIncludes{"V8BindingMacros.h"} = 1;
+            push(@implContentDecls, "    EXCEPTION_BLOCK($nativeType, $parameterName, " .
+                 JSValueToNative($parameter, "args[$paramIndex]", BasicTypeCanFailConversion($parameter) ?  "${parameterName}Ok" : undef) . ");\n");
         }
 
         if ($parameter->extendedAttributes->{"IsIndex"}) {
-            $implIncludes{"ExceptionCode.h"} = 1;
-            push(@implContentDecls,
-"    if (UNLIKELY($parameterName < 0)) {\n" .
-"        ec = INDEX_SIZE_ERR;\n" .
-"        goto fail;\n" .
-"    }\n");
+            push(@implContentDecls, "    if (UNLIKELY($parameterName < 0)) {\n");
+            push(@implContentDecls, "        ec = INDEX_SIZE_ERR;\n");
+            push(@implContentDecls, "        goto fail;\n");
+            push(@implContentDecls, "    }\n");
         }
 
@@ -2826 +2844 @@
     return "$value->NumberValue()" if $type eq "SVGNumber";
 
-    return "toInt32($value${maybeOkParam})" if $type eq "unsigned long" or $type eq "unsigned short" or $type eq "long";
+    return "toInt32($value${maybeOkParam})" if $type eq "long";
+    return "toUInt32($value${maybeOkParam})" if $type eq "unsigned long" or $type eq "unsigned short";
     return "toInt64($value)" if $type eq "unsigned long long" or $type eq "long long";
     return "static_cast<Range::CompareHow>($value->Int32Value())" if $type eq "CompareHow";
@@ -2956 +2975 @@
 
     foreach my $parameter (@{$function->parameters}) {
-        if ($parameter->extendedAttributes->{"Optional"}) {
+        if ($parameter->extendedAttributes->{"Optional"} || $parameter->extendedAttributes->{"Callback"}) {
             return 0;
         }

trunk/WebCore/bindings/scripts/test/JS/JSTestCallback.cpp

@@ -43 +43 @@
 JSTestCallback::~JSTestCallback()
 {
-    if (m_scriptExecutionContext->isContextThread())
+    ScriptExecutionContext* context = scriptExecutionContext();
+    // When the context is destroyed, all tasks with a reference to a callback
+    // should be deleted. So if the context is 0, we are on the context thread.
+    if (!context || context->isContextThread())
         delete m_data;
     else
-        m_data->globalObject()->scriptExecutionContext()->postTask(DeleteCallbackDataTask::create(m_data));
+        context->postTask(DeleteCallbackDataTask::create(m_data));
 #ifndef NDEBUG
     m_data = 0;

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

@@ -26 +26 @@
 #include "IDBBindingUtilities.h"
 #include "IDBKey.h"
+#include "JSDOMBinding.h"
 #include "JSEventListener.h"
 #include "JSTestCallback.h"
@@ -795 +796 @@
     TestObj* imp = static_cast<TestObj*>(castedThis->impl());
     int intArg = exec->argument(0).toInt32(exec);
+    if (exec->hadException())
+        return JSValue::encode(jsUndefined());
     const String& strArg = ustringToString(exec->argument(1).toString(exec));
+    if (exec->hadException())
+        return JSValue::encode(jsUndefined());
     TestObj* objArg = toTestObj(exec->argument(2));
+    if (exec->hadException())
+        return JSValue::encode(jsUndefined());
 
     imp->voidMethodWithArgs(intArg, strArg, objArg);
@@ -823 +830 @@
     TestObj* imp = static_cast<TestObj*>(castedThis->impl());
     int intArg = exec->argument(0).toInt32(exec);
+    if (exec->hadException())
+        return JSValue::encode(jsUndefined());
     const String& strArg = ustringToString(exec->argument(1).toString(exec));
+    if (exec->hadException())
+        return JSValue::encode(jsUndefined());
     TestObj* objArg = toTestObj(exec->argument(2));
+    if (exec->hadException())
+        return JSValue::encode(jsUndefined());
 
 
@@ -852 +865 @@
     TestObj* imp = static_cast<TestObj*>(castedThis->impl());
     int intArg = exec->argument(0).toInt32(exec);
+    if (exec->hadException())
+        return JSValue::encode(jsUndefined());
     const String& strArg = ustringToString(exec->argument(1).toString(exec));
+    if (exec->hadException())
+        return JSValue::encode(jsUndefined());
     TestObj* objArg = toTestObj(exec->argument(2));
+    if (exec->hadException())
+        return JSValue::encode(jsUndefined());
 
 
@@ -870 +889 @@
         return JSValue::encode(jsUndefined());
     const String& strArg = ustringToString(exec->argument(0).toString(exec));
+    if (exec->hadException())
+        return JSValue::encode(jsUndefined());
     TestObj* objArg = toTestObj(exec->argument(1));
+    if (exec->hadException())
+        return JSValue::encode(jsUndefined());
 
 
@@ -888 +911 @@
     ExceptionCode ec = 0;
     const String& strArg = ustringToString(exec->argument(0).toString(exec));
+    if (exec->hadException())
+        return JSValue::encode(jsUndefined());
     TestObj* objArg = toTestObj(exec->argument(1));
+    if (exec->hadException())
+        return JSValue::encode(jsUndefined());
 
 
@@ -904 +931 @@
     TestObj* imp = static_cast<TestObj*>(castedThis->impl());
     RefPtr<SerializedScriptValue> serializedArg = SerializedScriptValue::create(exec, exec->argument(0));
+    if (exec->hadException())
+        return JSValue::encode(jsUndefined());
 
     imp->serializedValue(serializedArg);
@@ -917 +946 @@
     TestObj* imp = static_cast<TestObj*>(castedThis->impl());
     RefPtr<IDBKey> key = createIDBKeyFromValue(exec, exec->argument(0));
+    if (exec->hadException())
+        return JSValue::encode(jsUndefined());
 
     imp->idbKey(key);
@@ -964 +995 @@
     ScriptCallStack callStack(exec, 1);
     log* intArg = tolog(exec->argument(0));
+    if (exec->hadException())
+        return JSValue::encode(jsUndefined());
 
     imp->customArgsAndException(intArg, &callStack, ec);
@@ -1024 +1057 @@
         return JSValue::encode(jsUndefined());
     int intArg = exec->argument(0).toInt32(exec);
+    if (exec->hadException())
+        return JSValue::encode(jsUndefined());
 
     imp->withDynamicFrameAndArg(dynamicFrame, intArg);
@@ -1040 +1075 @@
         return JSValue::encode(jsUndefined());
     int intArg = exec->argument(0).toInt32(exec);
+    if (exec->hadException())
+        return JSValue::encode(jsUndefined());
 
     int argsCount = exec->argumentCount();
-    if (argsCount < 2) {
+    if (argsCount <= 1) {
         imp->withDynamicFrameAndOptionalArg(dynamicFrame, intArg);
         return JSValue::encode(jsUndefined());
@@ -1048 +1085 @@
 
     int optionalArg = exec->argument(1).toInt32(exec);
+    if (exec->hadException())
+        return JSValue::encode(jsUndefined());
 
     imp->withDynamicFrameAndOptionalArg(dynamicFrame, intArg, optionalArg);
@@ -1064 +1103 @@
         return JSValue::encode(jsUndefined());
     int intArg = exec->argument(0).toInt32(exec);
+    if (exec->hadException())
+        return JSValue::encode(jsUndefined());
 
     imp->withDynamicFrameAndUserGesture(dynamicFrame, intArg, processingUserGesture(exec));
@@ -1080 +1121 @@
         return JSValue::encode(jsUndefined());
     int intArg = exec->argument(0).toInt32(exec);
+    if (exec->hadException())
+        return JSValue::encode(jsUndefined());
 
     int argsCount = exec->argumentCount();
-    if (argsCount < 2) {
+    if (argsCount <= 1) {
         imp->withDynamicFrameAndUserGestureASAD(dynamicFrame, intArg);
         return JSValue::encode(jsUndefined());
@@ -1088 +1131 @@
 
     int optionalArg = exec->argument(1).toInt32(exec);
+    if (exec->hadException())
+        return JSValue::encode(jsUndefined());
 
     imp->withDynamicFrameAndUserGestureASAD(dynamicFrame, intArg, optionalArg, processingUserGesture(exec));
@@ -1175 +1220 @@
 
     int argsCount = exec->argumentCount();
-    if (argsCount < 1) {
+    if (argsCount <= 0) {
         imp->methodWithOptionalArg();
         return JSValue::encode(jsUndefined());
@@ -1181 +1226 @@
 
     int opt = exec->argument(0).toInt32(exec);
+    if (exec->hadException())
+        return JSValue::encode(jsUndefined());
 
     imp->methodWithOptionalArg(opt);
@@ -1194 +1241 @@
     TestObj* imp = static_cast<TestObj*>(castedThis->impl());
     int nonOpt = exec->argument(0).toInt32(exec);
+    if (exec->hadException())
+        return JSValue::encode(jsUndefined());
 
     int argsCount = exec->argumentCount();
-    if (argsCount < 2) {
+    if (argsCount <= 1) {
         imp->methodWithNonOptionalArgAndOptionalArg(nonOpt);
         return JSValue::encode(jsUndefined());
@@ -1202 +1251 @@
 
     int opt = exec->argument(1).toInt32(exec);
+    if (exec->hadException())
+        return JSValue::encode(jsUndefined());
 
     imp->methodWithNonOptionalArgAndOptionalArg(nonOpt, opt);
@@ -1215 +1266 @@
     TestObj* imp = static_cast<TestObj*>(castedThis->impl());
     int nonOpt = exec->argument(0).toInt32(exec);
+    if (exec->hadException())
+        return JSValue::encode(jsUndefined());
 
     int argsCount = exec->argumentCount();
-    if (argsCount < 2) {
+    if (argsCount <= 1) {
         imp->methodWithNonOptionalArgAndTwoOptionalArgs(nonOpt);
         return JSValue::encode(jsUndefined());
@@ -1223 +1276 @@
 
     int opt1 = exec->argument(1).toInt32(exec);
+    if (exec->hadException())
+        return JSValue::encode(jsUndefined());
     int opt2 = exec->argument(2).toInt32(exec);
+    if (exec->hadException())
+        return JSValue::encode(jsUndefined());
 
     imp->methodWithNonOptionalArgAndTwoOptionalArgs(nonOpt, opt1, opt2);
@@ -1238 +1295 @@
     if (exec->argumentCount() <= 0 || !exec->argument(0).isObject()) {
         setDOMException(exec, TYPE_MISMATCH_ERR);
-        return jsUndefined();
+        return JSValue::encode(jsUndefined());
     }
     RefPtr<TestCallback> callback = JSTestCallback::create(asObject(exec->argument(0)), castedThis->globalObject());
@@ -1254 +1311 @@
     TestObj* imp = static_cast<TestObj*>(castedThis->impl());
     int nonCallback = exec->argument(0).toInt32(exec);
+    if (exec->hadException())
+        return JSValue::encode(jsUndefined());
     if (exec->argumentCount() <= 1 || !exec->argument(1).isObject()) {
         setDOMException(exec, TYPE_MISMATCH_ERR);
-        return jsUndefined();
+        return JSValue::encode(jsUndefined());
     }
     RefPtr<TestCallback> callback = JSTestCallback::create(asObject(exec->argument(1)), castedThis->globalObject());
@@ -1271 +1330 @@
     JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(thisValue));
     TestObj* imp = static_cast<TestObj*>(castedThis->impl());
+    RefPtr<TestCallback> callback;
+    if (exec->argumentCount() > 0 && !exec->argument(0).isNull() && !exec->argument(0).isUndefined()) {
+        if (!exec->argument(0).isObject()) {
+            setDOMException(exec, TYPE_MISMATCH_ERR);
+            return JSValue::encode(jsUndefined());
+        }
+        callback = JSTestCallback::create(asObject(exec->argument(0)), castedThis->globalObject());
+    }
+
+    imp->methodWithCallbackAndOptionalArg(callback);
+    return JSValue::encode(jsUndefined());
+}
+
+static EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionOverloadedMethod1(ExecState* exec)
+{
+    JSValue thisValue = exec->hostThisValue();
+    if (!thisValue.inherits(&JSTestObj::s_info))
+        return throwVMTypeError(exec);
+    JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(thisValue));
+    TestObj* imp = static_cast<TestObj*>(castedThis->impl());
+    TestObj* objArg = toTestObj(exec->argument(0));
+    if (exec->hadException())
+        return JSValue::encode(jsUndefined());
+    const String& strArg = ustringToString(exec->argument(1).toString(exec));
+    if (exec->hadException())
+        return JSValue::encode(jsUndefined());
+
+    imp->overloadedMethod(objArg, strArg);
+    return JSValue::encode(jsUndefined());
+}
+
+static EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionOverloadedMethod2(ExecState* exec)
+{
+    JSValue thisValue = exec->hostThisValue();
+    if (!thisValue.inherits(&JSTestObj::s_info))
+        return throwVMTypeError(exec);
+    JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(thisValue));
+    TestObj* imp = static_cast<TestObj*>(castedThis->impl());
+    TestObj* objArg = toTestObj(exec->argument(0));
+    if (exec->hadException())
+        return JSValue::encode(jsUndefined());
 
     int argsCount = exec->argumentCount();
-    if (argsCount < 1) {
-        imp->methodWithCallbackAndOptionalArg();
+    if (argsCount <= 1) {
+        imp->overloadedMethod(objArg);
         return JSValue::encode(jsUndefined());
     }
 
-    if (exec->argumentCount() <= 0 || !exec->argument(0).isObject()) {
-        setDOMException(exec, TYPE_MISMATCH_ERR);
-        return jsUndefined();
-    }
-    RefPtr<TestCallback> callback = JSTestCallback::create(asObject(exec->argument(0)), castedThis->globalObject());
-
-    imp->methodWithCallbackAndOptionalArg(callback);
-    return JSValue::encode(jsUndefined());
-}
-
-static EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionOverloadedMethod1(ExecState* exec)
-{
-    JSValue thisValue = exec->hostThisValue();
-    if (!thisValue.inherits(&JSTestObj::s_info))
-        return throwVMTypeError(exec);
-    JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(thisValue));
-    TestObj* imp = static_cast<TestObj*>(castedThis->impl());
-    TestObj* objArg = toTestObj(exec->argument(0));
-    const String& strArg = ustringToString(exec->argument(1).toString(exec));
-
-    imp->overloadedMethod(objArg, strArg);
-    return JSValue::encode(jsUndefined());
-}
-
-static EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionOverloadedMethod2(ExecState* exec)
-{
-    JSValue thisValue = exec->hostThisValue();
-    if (!thisValue.inherits(&JSTestObj::s_info))
-        return throwVMTypeError(exec);
-    JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(thisValue));
-    TestObj* imp = static_cast<TestObj*>(castedThis->impl());
-    TestObj* objArg = toTestObj(exec->argument(0));
-
-    int argsCount = exec->argumentCount();
-    if (argsCount < 2) {
-        imp->overloadedMethod(objArg);
-        return JSValue::encode(jsUndefined());
-    }
-
     int intArg = exec->argument(1).toInt32(exec);
+    if (exec->hadException())
+        return JSValue::encode(jsUndefined());
 
     imp->overloadedMethod(objArg, intArg);
@@ -1331 +1394 @@
     TestObj* imp = static_cast<TestObj*>(castedThis->impl());
     const String& strArg = ustringToString(exec->argument(0).toString(exec));
+    if (exec->hadException())
+        return JSValue::encode(jsUndefined());
 
     imp->overloadedMethod(strArg);
@@ -1344 +1409 @@
     TestObj* imp = static_cast<TestObj*>(castedThis->impl());
     int intArg = exec->argument(0).toInt32(exec);
+    if (exec->hadException())
+        return JSValue::encode(jsUndefined());
 
     imp->overloadedMethod(intArg);

trunk/WebCore/bindings/scripts/test/V8/V8TestObj.cpp

@@ -30 +30 @@
 #include "SerializedScriptValue.h"
 #include "V8Binding.h"
+#include "V8BindingMacros.h"
 #include "V8BindingState.h"
 #include "V8DOMWrapper.h"
@@ -557 +558 @@
     INC_STATS("DOM.TestObj.voidMethodWithArgs");
     TestObj* imp = V8TestObj::toNative(args.Holder());
-    int intArg = toInt32(args[0]);
-    V8Parameter<> strArg = args[1];
-    TestObj* objArg = V8TestObj::HasInstance(args[2]) ? V8TestObj::toNative(v8::Handle<v8::Object>::Cast(args[2])) : 0;
+    EXCEPTION_BLOCK(int, intArg, toInt32(args[0]));
+    STRING_TO_V8PARAMETER_EXCEPTION_BLOCK(V8Parameter<>, strArg, args[1]);
+    EXCEPTION_BLOCK(TestObj*, objArg, V8TestObj::HasInstance(args[2]) ? V8TestObj::toNative(v8::Handle<v8::Object>::Cast(args[2])) : 0);
     imp->voidMethodWithArgs(intArg, strArg, objArg);
     return v8::Handle<v8::Value>();
@@ -575 +576 @@
     INC_STATS("DOM.TestObj.intMethodWithArgs");
     TestObj* imp = V8TestObj::toNative(args.Holder());
-    int intArg = toInt32(args[0]);
-    V8Parameter<> strArg = args[1];
-    TestObj* objArg = V8TestObj::HasInstance(args[2]) ? V8TestObj::toNative(v8::Handle<v8::Object>::Cast(args[2])) : 0;
+    EXCEPTION_BLOCK(int, intArg, toInt32(args[0]));
+    STRING_TO_V8PARAMETER_EXCEPTION_BLOCK(V8Parameter<>, strArg, args[1]);
+    EXCEPTION_BLOCK(TestObj*, objArg, V8TestObj::HasInstance(args[2]) ? V8TestObj::toNative(v8::Handle<v8::Object>::Cast(args[2])) : 0);
     return v8::Integer::New(imp->intMethodWithArgs(intArg, strArg, objArg));
 }
@@ -592 +593 @@
     INC_STATS("DOM.TestObj.objMethodWithArgs");
     TestObj* imp = V8TestObj::toNative(args.Holder());
-    int intArg = toInt32(args[0]);
-    V8Parameter<> strArg = args[1];
-    TestObj* objArg = V8TestObj::HasInstance(args[2]) ? V8TestObj::toNative(v8::Handle<v8::Object>::Cast(args[2])) : 0;
+    EXCEPTION_BLOCK(int, intArg, toInt32(args[0]));
+    STRING_TO_V8PARAMETER_EXCEPTION_BLOCK(V8Parameter<>, strArg, args[1]);
+    EXCEPTION_BLOCK(TestObj*, objArg, V8TestObj::HasInstance(args[2]) ? V8TestObj::toNative(v8::Handle<v8::Object>::Cast(args[2])) : 0);
     return toV8(imp->objMethodWithArgs(intArg, strArg, objArg));
 }
@@ -604 +605 @@
         return v8::Handle<v8::Value>();
     TestObj* imp = V8TestObj::toNative(args.Holder());
-    V8Parameter<> strArg = args[0];
-    TestObj* objArg = V8TestObj::HasInstance(args[1]) ? V8TestObj::toNative(v8::Handle<v8::Object>::Cast(args[1])) : 0;
+    STRING_TO_V8PARAMETER_EXCEPTION_BLOCK(V8Parameter<>, strArg, args[0]);
+    EXCEPTION_BLOCK(TestObj*, objArg, V8TestObj::HasInstance(args[1]) ? V8TestObj::toNative(v8::Handle<v8::Object>::Cast(args[1])) : 0);
     return toV8(imp->methodThatRequiresAllArgs(strArg, objArg));
 }
@@ -617 +618 @@
     ExceptionCode ec = 0;
     {
-    V8Parameter<> strArg = args[0];
-    TestObj* objArg = V8TestObj::HasInstance(args[1]) ? V8TestObj::toNative(v8::Handle<v8::Object>::Cast(args[1])) : 0;
+    STRING_TO_V8PARAMETER_EXCEPTION_BLOCK(V8Parameter<>, strArg, args[0]);
+    EXCEPTION_BLOCK(TestObj*, objArg, V8TestObj::HasInstance(args[1]) ? V8TestObj::toNative(v8::Handle<v8::Object>::Cast(args[1])) : 0);
     RefPtr<TestObj> result = imp->methodThatRequiresAllArgsAndThrows(strArg, objArg, ec);
     if (UNLIKELY(ec))
@@ -645 +646 @@
     INC_STATS("DOM.TestObj.idbKey");
     TestObj* imp = V8TestObj::toNative(args.Holder());
-    RefPtr<IDBKey> key = createIDBKeyFromValue(args[0]);
+    EXCEPTION_BLOCK(RefPtr<IDBKey>, key, createIDBKeyFromValue(args[0]));
     imp->idbKey(key);
     return v8::Handle<v8::Value>();
@@ -675 +676 @@
     if (!callStack)
         return v8::Undefined();
-    log* intArg = V8log::HasInstance(args[0]) ? V8log::toNative(v8::Handle<v8::Object>::Cast(args[0])) : 0;
+    EXCEPTION_BLOCK(log*, intArg, V8log::HasInstance(args[0]) ? V8log::toNative(v8::Handle<v8::Object>::Cast(args[0])) : 0);
     imp->customArgsAndException(intArg, callStack.get(), ec);
     if (UNLIKELY(ec))
@@ -723 +724 @@
     INC_STATS("DOM.TestObj.withDynamicFrameAndArg");
     TestObj* imp = V8TestObj::toNative(args.Holder());
-    int intArg = toInt32(args[0]);
+    EXCEPTION_BLOCK(int, intArg, toInt32(args[0]));
     Frame* enteredFrame = V8Proxy::retrieveFrameForEnteredContext();
     if (!enteredFrame)
@@ -735 +736 @@
     INC_STATS("DOM.TestObj.withDynamicFrameAndOptionalArg");
     TestObj* imp = V8TestObj::toNative(args.Holder());
-    int intArg = toInt32(args[0]);
+    EXCEPTION_BLOCK(int, intArg, toInt32(args[0]));
     if (args.Length() <= 1) {
         Frame* enteredFrame = V8Proxy::retrieveFrameForEnteredContext();
@@ -743 +744 @@
         return v8::Handle<v8::Value>();
     }
-    int optionalArg = toInt32(args[1]);
+    EXCEPTION_BLOCK(int, optionalArg, toInt32(args[1]));
     Frame* enteredFrame = V8Proxy::retrieveFrameForEnteredContext();
     if (!enteredFrame)
@@ -755 +756 @@
     INC_STATS("DOM.TestObj.withDynamicFrameAndUserGesture");
     TestObj* imp = V8TestObj::toNative(args.Holder());
-    int intArg = toInt32(args[0]);
+    EXCEPTION_BLOCK(int, intArg, toInt32(args[0]));
     Frame* enteredFrame = V8Proxy::retrieveFrameForEnteredContext();
     if (!enteredFrame)
@@ -767 +768 @@
     INC_STATS("DOM.TestObj.withDynamicFrameAndUserGestureASAD");
     TestObj* imp = V8TestObj::toNative(args.Holder());
-    int intArg = toInt32(args[0]);
+    EXCEPTION_BLOCK(int, intArg, toInt32(args[0]));
     if (args.Length() <= 1) {
         Frame* enteredFrame = V8Proxy::retrieveFrameForEnteredContext();
@@ -775 +776 @@
         return v8::Handle<v8::Value>();
     }
-    int optionalArg = toInt32(args[1]);
+    EXCEPTION_BLOCK(int, optionalArg, toInt32(args[1]));
     Frame* enteredFrame = V8Proxy::retrieveFrameForEnteredContext();
     if (!enteredFrame)
@@ -862 +863 @@
         return v8::Handle<v8::Value>();
     }
-    int opt = toInt32(args[0]);
+    EXCEPTION_BLOCK(int, opt, toInt32(args[0]));
     imp->methodWithOptionalArg(opt);
     return v8::Handle<v8::Value>();
@@ -871 +872 @@
     INC_STATS("DOM.TestObj.methodWithNonOptionalArgAndOptionalArg");
     TestObj* imp = V8TestObj::toNative(args.Holder());
-    int nonOpt = toInt32(args[0]);
+    EXCEPTION_BLOCK(int, nonOpt, toInt32(args[0]));
     if (args.Length() <= 1) {
         imp->methodWithNonOptionalArgAndOptionalArg(nonOpt);
         return v8::Handle<v8::Value>();
     }
-    int opt = toInt32(args[1]);
+    EXCEPTION_BLOCK(int, opt, toInt32(args[1]));
     imp->methodWithNonOptionalArgAndOptionalArg(nonOpt, opt);
     return v8::Handle<v8::Value>();
@@ -885 +886 @@
     INC_STATS("DOM.TestObj.methodWithNonOptionalArgAndTwoOptionalArgs");
     TestObj* imp = V8TestObj::toNative(args.Holder());
-    int nonOpt = toInt32(args[0]);
+    EXCEPTION_BLOCK(int, nonOpt, toInt32(args[0]));
     if (args.Length() <= 1) {
         imp->methodWithNonOptionalArgAndTwoOptionalArgs(nonOpt);
         return v8::Handle<v8::Value>();
     }
-    int opt1 = toInt32(args[1]);
-    int opt2 = toInt32(args[2]);
+    EXCEPTION_BLOCK(int, opt1, toInt32(args[1]));
+    EXCEPTION_BLOCK(int, opt2, toInt32(args[2]));
     imp->methodWithNonOptionalArgAndTwoOptionalArgs(nonOpt, opt1, opt2);
     return v8::Handle<v8::Value>();
@@ -911 +912 @@
     INC_STATS("DOM.TestObj.methodWithNonCallbackArgAndCallbackArg");
     TestObj* imp = V8TestObj::toNative(args.Holder());
-    int nonCallback = toInt32(args[0]);
+    EXCEPTION_BLOCK(int, nonCallback, toInt32(args[0]));
     if (args.Length() <= 1 || !args[1]->IsObject())
         return throwError(TYPE_MISMATCH_ERR);
@@ -923 +924 @@
     INC_STATS("DOM.TestObj.methodWithCallbackAndOptionalArg");
     TestObj* imp = V8TestObj::toNative(args.Holder());
-    if (args.Length() <= 0) {
-        imp->methodWithCallbackAndOptionalArg();
-        return v8::Handle<v8::Value>();
-    }
-    if (args.Length() <= 0 || !args[0]->IsObject())
-        return throwError(TYPE_MISMATCH_ERR);
-    RefPtr<TestCallback> callback = V8TestCallback::create(args[0], getScriptExecutionContext());
+    RefPtr<TestCallback> callback;
+    if (args.Length() > 0 && !args[0]->IsNull() && !args[0]->IsUndefined()) {
+        if (!args[0]->IsObject())
+            return throwError(TYPE_MISMATCH_ERR);
+        callback = V8TestCallback::create(args[0], getScriptExecutionContext());
+    }
     imp->methodWithCallbackAndOptionalArg(callback);
     return v8::Handle<v8::Value>();
@@ -938 +938 @@
     INC_STATS("DOM.TestObj.overloadedMethod1");
     TestObj* imp = V8TestObj::toNative(args.Holder());
-    TestObj* objArg = V8TestObj::HasInstance(args[0]) ? V8TestObj::toNative(v8::Handle<v8::Object>::Cast(args[0])) : 0;
-    V8Parameter<> strArg = args[1];
+    EXCEPTION_BLOCK(TestObj*, objArg, V8TestObj::HasInstance(args[0]) ? V8TestObj::toNative(v8::Handle<v8::Object>::Cast(args[0])) : 0);
+    STRING_TO_V8PARAMETER_EXCEPTION_BLOCK(V8Parameter<>, strArg, args[1]);
     imp->overloadedMethod(objArg, strArg);
     return v8::Handle<v8::Value>();
@@ -948 +948 @@
     INC_STATS("DOM.TestObj.overloadedMethod2");
     TestObj* imp = V8TestObj::toNative(args.Holder());
-    TestObj* objArg = V8TestObj::HasInstance(args[0]) ? V8TestObj::toNative(v8::Handle<v8::Object>::Cast(args[0])) : 0;
+    EXCEPTION_BLOCK(TestObj*, objArg, V8TestObj::HasInstance(args[0]) ? V8TestObj::toNative(v8::Handle<v8::Object>::Cast(args[0])) : 0);
     if (args.Length() <= 1) {
         imp->overloadedMethod(objArg);
         return v8::Handle<v8::Value>();
     }
-    int intArg = toInt32(args[1]);
+    EXCEPTION_BLOCK(int, intArg, toInt32(args[1]));
     imp->overloadedMethod(objArg, intArg);
     return v8::Handle<v8::Value>();
@@ -962 +962 @@
     INC_STATS("DOM.TestObj.overloadedMethod3");
     TestObj* imp = V8TestObj::toNative(args.Holder());
-    V8Parameter<> strArg = args[0];
+    STRING_TO_V8PARAMETER_EXCEPTION_BLOCK(V8Parameter<>, strArg, args[0]);
     imp->overloadedMethod(strArg);
     return v8::Handle<v8::Value>();
@@ -971 +971 @@
     INC_STATS("DOM.TestObj.overloadedMethod4");
     TestObj* imp = V8TestObj::toNative(args.Holder());
-    int intArg = toInt32(args[0]);
+    EXCEPTION_BLOCK(int, intArg, toInt32(args[0]));
     imp->overloadedMethod(intArg);
     return v8::Handle<v8::Value>();
@@ -1089 +1089 @@
     {"methodWithNonOptionalArgAndOptionalArg", TestObjInternal::methodWithNonOptionalArgAndOptionalArgCallback},
     {"methodWithNonOptionalArgAndTwoOptionalArgs", TestObjInternal::methodWithNonOptionalArgAndTwoOptionalArgsCallback},
+    {"methodWithCallbackArg", TestObjInternal::methodWithCallbackArgCallback},
+    {"methodWithNonCallbackArgAndCallbackArg", TestObjInternal::methodWithNonCallbackArgAndCallbackArgCallback},
     {"methodWithCallbackAndOptionalArg", TestObjInternal::methodWithCallbackAndOptionalArgCallback},
     {"overloadedMethod", TestObjInternal::overloadedMethodCallback},
@@ -1162 +1164 @@
     v8::Handle<v8::Signature> customArgsAndExceptionSignature = v8::Signature::New(desc, customArgsAndExceptionArgc, customArgsAndExceptionArgv);
     proto->Set(v8::String::New("customArgsAndException"), v8::FunctionTemplate::New(TestObjInternal::customArgsAndExceptionCallback, v8::Handle<v8::Value>(), customArgsAndExceptionSignature));
-
-    // Custom Signature 'methodWithCallbackArg'
-    const int methodWithCallbackArgArgc = 1;
-    v8::Handle<v8::FunctionTemplate> methodWithCallbackArgArgv[methodWithCallbackArgArgc] = { V8TestCallback::GetRawTemplate() };
-    v8::Handle<v8::Signature> methodWithCallbackArgSignature = v8::Signature::New(desc, methodWithCallbackArgArgc, methodWithCallbackArgArgv);
-    proto->Set(v8::String::New("methodWithCallbackArg"), v8::FunctionTemplate::New(TestObjInternal::methodWithCallbackArgCallback, v8::Handle<v8::Value>(), methodWithCallbackArgSignature));
-
-    // Custom Signature 'methodWithNonCallbackArgAndCallbackArg'
-    const int methodWithNonCallbackArgAndCallbackArgArgc = 2;
-    v8::Handle<v8::FunctionTemplate> methodWithNonCallbackArgAndCallbackArgArgv[methodWithNonCallbackArgAndCallbackArgArgc] = { v8::Handle<v8::FunctionTemplate>(), V8TestCallback::GetRawTemplate() };
-    v8::Handle<v8::Signature> methodWithNonCallbackArgAndCallbackArgSignature = v8::Signature::New(desc, methodWithNonCallbackArgAndCallbackArgArgc, methodWithNonCallbackArgAndCallbackArgArgv);
-    proto->Set(v8::String::New("methodWithNonCallbackArgAndCallbackArg"), v8::FunctionTemplate::New(TestObjInternal::methodWithNonCallbackArgAndCallbackArgCallback, v8::Handle<v8::Value>(), methodWithNonCallbackArgAndCallbackArgSignature));
     batchConfigureConstants(desc, proto, TestObjConsts, sizeof(TestObjConsts) / sizeof(*TestObjConsts));
 

trunk/WebCore/bindings/v8/V8Binding.h

@@ -221 +221 @@
     class V8Parameter {
     public:
-        V8Parameter (v8::Local<v8::Value> object) :m_v8Object(object) { }
+        V8Parameter(v8::Local<v8::Value> object = v8::Local<v8::Value>()) : m_v8Object(object) { }
         operator String();
         operator AtomicString();

trunk/WebCore/bindings/v8/custom/V8BindingMacros.h

@@ -38 +38 @@
     }
 
-#define TO_WEBCORE_STRING_EXCEPTION_BLOCK(var, value)                      \
-    String var;                                                            \
-    {                                                                      \
-        v8::TryCatch block;                                                \
-        v8::Handle<v8::String> v8String = (value)->ToString();             \
-        if (block.HasCaught())                                             \
-            return block.ReThrow();                                        \
-        var = v8StringToWebCoreString<String>(v8String, DoNotExternalize); \
+#define STRING_TO_V8PARAMETER_EXCEPTION_BLOCK(type, var, value) \
+    type var;                                                   \
+    {                                                           \
+        v8::Local<v8::Value> v8Value = (value);                 \
+        v8::TryCatch block;                                     \
+        (value)->ToString();                                    \
+        if (block.HasCaught())                                  \
+            return block.ReThrow();                             \
+        var = v8Value;                                          \
     }

trunk/WebCore/bindings/v8/custom/V8DOMWindowCustom.cpp

@@ -33 +33 @@
 
 #include "Chrome.h"
-#include "Database.h"
 #include "DOMTimer.h"
 #include "DOMWindow.h"
@@ -56 +55 @@
 #include "V8BindingState.h"
 #include "V8CustomEventListener.h"
-#include "V8Database.h"
-#include "V8DatabaseCallback.h"
 #include "V8GCForContextDispose.h"
 #include "V8HiddenPropertyName.h"
@@ -658 +655 @@
 }
 
-#if ENABLE(DATABASE)
-v8::Handle<v8::Value> V8DOMWindow::openDatabaseCallback(const v8::Arguments& args)
-{
-    INC_STATS("DOM.DOMWindow.openDatabase");
-    if (args.Length() < 4)
-        return throwError(SYNTAX_ERR);
-
-    TO_WEBCORE_STRING_EXCEPTION_BLOCK(name, args[0]);
-    TO_WEBCORE_STRING_EXCEPTION_BLOCK(version, args[1]);
-    TO_WEBCORE_STRING_EXCEPTION_BLOCK(displayName, args[2]);
-    EXCEPTION_BLOCK(unsigned long, estimatedSize, args[3]->Uint32Value());
-
-    DOMWindow* imp = V8DOMWindow::toNative(args.Holder());
-    if (!V8BindingSecurity::canAccessFrame(V8BindingState::Only(), imp->frame(), true))
-        return v8::Undefined();
-
-    ScriptExecutionContext* scriptExecutionContext = getScriptExecutionContext();
-    RefPtr<DatabaseCallback> creationCallback;
-    if (args.Length() >= 5) {
-        if (!args[4]->IsObject())
-            return throwError(TYPE_MISMATCH_ERR);
-
-        creationCallback = V8DatabaseCallback::create(args[4], scriptExecutionContext);
-    }
-
-    ExceptionCode ec = 0;
-    v8::Handle<v8::Value> result = toV8(imp->openDatabase(name, version, displayName, estimatedSize, creationCallback.release(), ec));
-
-    V8Proxy::setDOMException(ec);
-    return result;
-}
-#endif // ENABLE(DATABASE)
-
 bool V8DOMWindow::namedSecurityCheck(v8::Local<v8::Object> host, v8::Local<v8::Value> key, v8::AccessType type, v8::Local<v8::Value>)
 {

trunk/WebCore/bindings/v8/custom/V8SQLTransactionCustom.cpp

@@ -56 +56 @@
         return throwError(SYNTAX_ERR);
 
-    TO_WEBCORE_STRING_EXCEPTION_BLOCK(statement, args[0]);
+    STRING_TO_V8PARAMETER_EXCEPTION_BLOCK(V8Parameter<>, statement, args[0]);
 
     Vector<SQLValue> sqlValues;
@@ -83 +83 @@
                 sqlValues.append(SQLValue(sqlValue));
             } else {
-                TO_WEBCORE_STRING_EXCEPTION_BLOCK(sqlValue, value);
+                STRING_TO_V8PARAMETER_EXCEPTION_BLOCK(V8Parameter<>, sqlValue, value);
                 sqlValues.append(SQLValue(sqlValue));
             }

trunk/WebCore/bindings/v8/custom/V8SQLTransactionSyncCustom.cpp

@@ -56 +56 @@
         return throwError(SYNTAX_ERR);
 
-    TO_WEBCORE_STRING_EXCEPTION_BLOCK(statement, args[0]);
+    STRING_TO_V8PARAMETER_EXCEPTION_BLOCK(V8Parameter<>, statement, args[0]);
 
     Vector<SQLValue> sqlValues;
@@ -83 +83 @@
                 sqlValues.append(SQLValue(sqlValue));
             } else {
-                TO_WEBCORE_STRING_EXCEPTION_BLOCK(sqlValue, value);
+                STRING_TO_V8PARAMETER_EXCEPTION_BLOCK(V8Parameter<>, sqlValue, value);
                 sqlValues.append(SQLValue(sqlValue));
             }

trunk/WebCore/bindings/v8/custom/V8WorkerContextCustom.cpp

@@ -34 +34 @@
 #include "V8WorkerContext.h"
 
-#if ENABLE(DATABASE)
-#include "Database.h"
-#include "V8Database.h"
-#include "V8DatabaseCallback.h"
-#include "V8DatabaseSync.h"
-#endif
 #include "DOMTimer.h"
 #include "ExceptionCode.h"
@@ -144 +138 @@
 }
 
-#if ENABLE(DATABASE)
-v8::Handle<v8::Value> V8WorkerContext::openDatabaseCallback(const v8::Arguments& args)
-{
-    INC_STATS("DOM.V8WorkerContext.openDatabase()");
-    if (args.Length() < 4)
-        return throwError(SYNTAX_ERR);
-
-    TO_WEBCORE_STRING_EXCEPTION_BLOCK(name, args[0]);
-    TO_WEBCORE_STRING_EXCEPTION_BLOCK(version, args[1]);
-    TO_WEBCORE_STRING_EXCEPTION_BLOCK(displayName, args[2]);
-    EXCEPTION_BLOCK(unsigned long, estimatedSize, args[3]->Uint32Value());
-
-    WorkerContext* workerContext = V8WorkerContext::toNative(args.Holder());
-
-    ScriptExecutionContext* scriptExecutionContext = getScriptExecutionContext();
-    RefPtr<DatabaseCallback> creationCallback;
-    if (args.Length() >= 5) {
-        if (!args[4]->IsObject())
-            return throwError(TYPE_MISMATCH_ERR);
-
-        creationCallback = V8DatabaseCallback::create(args[4], scriptExecutionContext);
-    }
-
-    ExceptionCode ec = 0;
-    v8::Handle<v8::Value> result = toV8(workerContext->openDatabase(name, version, displayName, estimatedSize, creationCallback.release(), ec));
-
-    V8Proxy::setDOMException(ec);
-    return result;
-}
-
-v8::Handle<v8::Value> V8WorkerContext::openDatabaseSyncCallback(const v8::Arguments& args)
-{
-    INC_STATS("DOM.V8WorkerContext.openDatabaseSync()");
-    if (args.Length() < 4)
-        return throwError(SYNTAX_ERR);
-
-    TO_WEBCORE_STRING_EXCEPTION_BLOCK(name, args[0]);
-    TO_WEBCORE_STRING_EXCEPTION_BLOCK(version, args[1]);
-    TO_WEBCORE_STRING_EXCEPTION_BLOCK(displayName, args[2]);
-    EXCEPTION_BLOCK(unsigned long, estimatedSize, args[3]->Uint32Value());
-
-    WorkerContext* workerContext = V8WorkerContext::toNative(args.Holder());
-
-    ScriptExecutionContext* scriptExecutionContext = getScriptExecutionContext();
-    RefPtr<DatabaseCallback> creationCallback;
-    if (args.Length() >= 5) {
-        if (!args[4]->IsObject())
-            return throwError(TYPE_MISMATCH_ERR);
-
-        creationCallback = V8DatabaseCallback::create(args[4], scriptExecutionContext);
-    }
-
-    ExceptionCode ec = 0;
-    v8::Handle<v8::Value> result = toV8(workerContext->openDatabaseSync(name, version, displayName, estimatedSize, creationCallback.release(), ec));
-
-    V8Proxy::setDOMException(ec);
-    return result;
-}
-#endif
-
 } // namespace WebCore
 

trunk/WebCore/page/DOMWindow.idl

@@ -161 +161 @@
 #endif    
 #if defined(ENABLE_DATABASE) && ENABLE_DATABASE
-        [EnabledAtRuntime, Custom] Database openDatabase(in DOMString name, in DOMString version, in DOMString displayName, in unsigned long estimatedSize, in DatabaseCallback creationCallback)
+        [EnabledAtRuntime, RequiresAllArguments=Raise] Database openDatabase(in DOMString name, in DOMString version, in DOMString displayName, in unsigned long estimatedSize, in [Callback, Optional] DatabaseCallback creationCallback)
             raises(DOMException);
 #endif

trunk/WebCore/storage/Database.cpp

@@ -271 +271 @@
 }
 
-void Database::transaction(PassRefPtr<SQLTransactionCallback> callback, PassRefPtr<SQLTransactionErrorCallback> errorCallback,
-                           PassRefPtr<VoidCallback> successCallback, bool readOnly)
+void Database::transaction(PassRefPtr<SQLTransactionCallback> callback, PassRefPtr<SQLTransactionErrorCallback> errorCallback, PassRefPtr<VoidCallback> successCallback)
+{
+    runTransaction(callback, errorCallback, successCallback, false);
+}
+
+void Database::readTransaction(PassRefPtr<SQLTransactionCallback> callback, PassRefPtr<SQLTransactionErrorCallback> errorCallback, PassRefPtr<VoidCallback> successCallback)
+{
+    runTransaction(callback, errorCallback, successCallback, true);
+}
+
+void Database::runTransaction(PassRefPtr<SQLTransactionCallback> callback, PassRefPtr<SQLTransactionErrorCallback> errorCallback,
+                              PassRefPtr<VoidCallback> successCallback, bool readOnly)
 {
     m_transactionQueue.append(SQLTransaction::create(this, callback, errorCallback, successCallback, 0, readOnly));

trunk/WebCore/storage/Database.h

@@ -60 +60 @@
     void changeVersion(const String& oldVersion, const String& newVersion, PassRefPtr<SQLTransactionCallback>,
                        PassRefPtr<SQLTransactionErrorCallback>, PassRefPtr<VoidCallback> successCallback);
-    void transaction(PassRefPtr<SQLTransactionCallback>, PassRefPtr<SQLTransactionErrorCallback>,
-                     PassRefPtr<VoidCallback> successCallback, bool readOnly);
+    void transaction(PassRefPtr<SQLTransactionCallback>, PassRefPtr<SQLTransactionErrorCallback>, PassRefPtr<VoidCallback> successCallback);
+    void readTransaction(PassRefPtr<SQLTransactionCallback>, PassRefPtr<SQLTransactionErrorCallback>, PassRefPtr<VoidCallback> successCallback);
 
     // Internal engine support
@@ -91 +91 @@
     Database(ScriptExecutionContext*, const String& name, const String& expectedVersion,
              const String& displayName, unsigned long estimatedSize);
+    void runTransaction(PassRefPtr<SQLTransactionCallback>, PassRefPtr<SQLTransactionErrorCallback>,
+                        PassRefPtr<VoidCallback> successCallback, bool readOnly);
 
     bool openAndVerifyVersion(bool setVersionInNewDatabase, ExceptionCode&);

trunk/WebCore/storage/Database.idl

@@ -35 +35 @@
     ] Database {
         readonly attribute DOMString version;
-        [Custom] void changeVersion(in DOMString oldVersion, in DOMString newVersion, in SQLTransactionCallback callback, in SQLTransactionErrorCallback errorCallback, in VoidCallback successCallback);
-        [Custom] void transaction(in SQLTransactionCallback callback, in SQLTransactionErrorCallback errorCallback, in VoidCallback successCallback);
-        [Custom] void readTransaction(in SQLTransactionCallback callback, in SQLTransactionErrorCallback errorCallback, in VoidCallback successCallback);
+        [RequiresAllArguments=Raise] void changeVersion(in DOMString oldVersion, in DOMString newVersion, in [Callback, Optional] SQLTransactionCallback callback, in [Callback, Optional] SQLTransactionErrorCallback errorCallback, in [Callback, Optional] VoidCallback successCallback);
+        [RequiresAllArguments=Raise] void transaction(in [Callback] SQLTransactionCallback callback, in [Callback, Optional] SQLTransactionErrorCallback errorCallback, in [Callback, Optional] VoidCallback successCallback);
+        [RequiresAllArguments=Raise] void readTransaction(in [Callback] SQLTransactionCallback callback, in [Callback, Optional] SQLTransactionErrorCallback errorCallback, in [Callback, Optional] VoidCallback successCallback);
     };
 

trunk/WebCore/storage/DatabaseSync.cpp

@@ -129 +129 @@
 }
 
-void DatabaseSync::transaction(PassRefPtr<SQLTransactionSyncCallback> callback, bool readOnly, ExceptionCode& ec)
+void DatabaseSync::transaction(PassRefPtr<SQLTransactionSyncCallback> callback, ExceptionCode& ec)
+{
+    runTransaction(callback, false, ec);
+}
+
+void DatabaseSync::readTransaction(PassRefPtr<SQLTransactionSyncCallback> callback, ExceptionCode& ec)
+{
+    runTransaction(callback, true, ec);
+}
+
+void DatabaseSync::runTransaction(PassRefPtr<SQLTransactionSyncCallback> callback, bool readOnly, ExceptionCode& ec)
 {
     ASSERT(m_scriptExecutionContext->isContextThread());

trunk/WebCore/storage/DatabaseSync.h

@@ -57 +57 @@
                                                      const String& displayName, unsigned long estimatedSize, PassRefPtr<DatabaseCallback>, ExceptionCode&);
     void changeVersion(const String& oldVersion, const String& newVersion, PassRefPtr<SQLTransactionSyncCallback>, ExceptionCode&);
-    void transaction(PassRefPtr<SQLTransactionSyncCallback>, bool readOnly, ExceptionCode&);
+    void transaction(PassRefPtr<SQLTransactionSyncCallback>, ExceptionCode&);
+    void readTransaction(PassRefPtr<SQLTransactionSyncCallback>, ExceptionCode&);
 
     virtual void markAsDeletedAndClose();
@@ -65 +66 @@
     DatabaseSync(ScriptExecutionContext*, const String& name, const String& expectedVersion,
                  const String& displayName, unsigned long estimatedSize);
+    void runTransaction(PassRefPtr<SQLTransactionSyncCallback>, bool readOnly, ExceptionCode&);
 };
 

trunk/WebCore/storage/DatabaseSync.idl

@@ -37 +37 @@
     ] DatabaseSync {
         readonly attribute DOMString version;
-        [Custom] void changeVersion(in DOMString oldVersion, in DOMString newVersion, in SQLTransactionSyncCallback callback);
-        [Custom] void transaction(in SQLTransactionSyncCallback callback);
-        [Custom] void readTransaction(in SQLTransactionSyncCallback callback);
+        [RequiresAllArguments=Raise] void changeVersion(in DOMString oldVersion, in DOMString newVersion, in [Callback, Optional] SQLTransactionSyncCallback callback) raises(DOMException);
+        [RequiresAllArguments=Raise] void transaction(in [Callback] SQLTransactionSyncCallback callback) raises(DOMException);
+        [RequiresAllArguments=Raise] void readTransaction(in [Callback] SQLTransactionSyncCallback callback) raises(DOMException);
     };
 

trunk/WebCore/workers/WorkerContext.idl

@@ -51 +51 @@
                  attribute [Replaceable] WorkerNavigator navigator;
 #if defined(ENABLE_DATABASE) && ENABLE_DATABASE
-        [EnabledAtRuntime, Custom] Database openDatabase(in DOMString name, in DOMString version, in DOMString displayName, in unsigned long estimatedSize, in DatabaseCallback creationCallback)
+        [EnabledAtRuntime, RequiresAllArguments=Raise] Database openDatabase(in DOMString name, in DOMString version, in DOMString displayName, in unsigned long estimatedSize, in [Callback, Optional] DatabaseCallback creationCallback)
             raises(DOMException);
-        [EnabledAtRuntime, Custom] DatabaseSync openDatabaseSync(in DOMString name, in DOMString version, in DOMString displayName, in unsigned long estimatedSize, in DatabaseCallback creationCallback);
+        [EnabledAtRuntime, RequiresAllArguments=Raise] DatabaseSync openDatabaseSync(in DOMString name, in DOMString version, in DOMString displayName, in unsigned long estimatedSize, in [Callback, Optional] DatabaseCallback creationCallback)
+            raises(DOMException);
 #endif