Changeset 60952 in webkit

Timestamp:

Jun 10, 2010 4:23:13 AM (14 years ago)

Author:

andreip@google.com

Message:

2010-06-09 Andrei Popescu <​andreip@google.com>

Reviewed by Adam Barth.

CodeGeneratorJS.pm incorrectly increments $paramIndex when a method is declared with [CallWith]
​https://bugs.webkit.org/show_bug.cgi?id=40372

Use two variables to keep track of the number of arguments passed from JavaScript vs the number
of arguments passed to the corresponding C++ method. These numbers can be different since
the parameter declared via [CallWith] is generated in the bindings instead of being passed
from JavaScript.

The layout tests added here test both that the parameters are read correctly as well as
tests some basic indexed database functionality. There are also bindings specific
tests added in TestObj.idl.

• storage/indexeddb/idb-objectstore-request-expected.txt: Added.
• storage/indexeddb/idb-objectstore-request.html: Added.
• storage/indexeddb/script-tests/idb-objectstore-request.js: Added. (openSuccess): (createSuccess): (createObjectStore): (doCreateOrOpen): (test):

2010-06-09 Andrei Popescu <​andreip@google.com>

Reviewed by Adam Barth.

CodeGeneratorJS.pm incorrectly increments $paramIndex when a method is declared with [CallWith]
​https://bugs.webkit.org/show_bug.cgi?id=40372

Use two variables to keep track of the number of arguments passed from JavaScript vs the number
of arguments passed to the corresponding C++ method. These numbers can be different since
the parameter declared via [CallWith] is generated in the bindings instead of being passed
from JavaScript.

Test: storage/indexeddb/idb-objectstore-request.html

• bindings/scripts/CodeGeneratorJS.pm:
• bindings/scripts/test/CPP/WebDOMTestObj.cpp: (WebDOMTestObj::withScriptExecutionContext):
• bindings/scripts/test/CPP/WebDOMTestObj.h:
• bindings/scripts/test/JS/JSTestObj.cpp: (WebCore::jsTestObjPrototypeFunctionWithDynamicFrameAndArg): (WebCore::jsTestObjPrototypeFunctionWithDynamicFrameAndOptionalArg): (WebCore::jsTestObjPrototypeFunctionWithDynamicFrameAndUserGesture): (WebCore::jsTestObjPrototypeFunctionWithDynamicFrameAndUserGestureASAD):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/storage/indexeddb/idb-objectstore-request-expected.txt (added)
• LayoutTests/storage/indexeddb/idb-objectstore-request.html (added)
• LayoutTests/storage/indexeddb/script-tests/idb-objectstore-request.js (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/bindings/scripts/CodeGeneratorJS.pm (modified) (5 diffs)
• WebCore/bindings/scripts/test/CPP/WebDOMTestObj.cpp (modified) (1 diff)
• WebCore/bindings/scripts/test/CPP/WebDOMTestObj.h (modified) (1 diff)
• WebCore/bindings/scripts/test/JS/JSTestObj.cpp (modified) (4 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-06-09  Andrei Popescu  <andreip@google.com>
+
+        Reviewed by Adam Barth.
+
+        CodeGeneratorJS.pm incorrectly increments $paramIndex when a method is declared with [CallWith]
+        https://bugs.webkit.org/show_bug.cgi?id=40372
+
+        Use two variables to keep track of the number of arguments passed from JavaScript vs the number
+        of arguments passed to the corresponding C++ method. These numbers can be different since
+        the parameter declared via [CallWith] is generated in the bindings instead of being passed
+        from JavaScript.
+        
+        The layout tests added here test both that the parameters are read correctly as well as
+        tests some basic indexed database functionality. There are also bindings specific
+        tests added in TestObj.idl. 
+
+        * storage/indexeddb/idb-objectstore-request-expected.txt: Added.
+        * storage/indexeddb/idb-objectstore-request.html: Added.
+        * storage/indexeddb/script-tests/idb-objectstore-request.js: Added.
+        (openSuccess):
+        (createSuccess):
+        (createObjectStore):
+        (doCreateOrOpen):
+        (test):
+
 2010-06-10  Adam Barth  <abarth@webkit.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-06-09  Andrei Popescu  <andreip@google.com>
+
+        Reviewed by Adam Barth.
+
+        CodeGeneratorJS.pm incorrectly increments $paramIndex when a method is declared with [CallWith]
+        https://bugs.webkit.org/show_bug.cgi?id=40372
+
+        Use two variables to keep track of the number of arguments passed from JavaScript vs the number
+        of arguments passed to the corresponding C++ method. These numbers can be different since
+        the parameter declared via [CallWith] is generated in the bindings instead of being passed
+        from JavaScript.
+
+        Test: storage/indexeddb/idb-objectstore-request.html
+
+        * bindings/scripts/CodeGeneratorJS.pm:
+        * bindings/scripts/test/CPP/WebDOMTestObj.cpp:
+        (WebDOMTestObj::withScriptExecutionContext):
+        * bindings/scripts/test/CPP/WebDOMTestObj.h:
+        * bindings/scripts/test/JS/JSTestObj.cpp:
+        (WebCore::jsTestObjPrototypeFunctionWithDynamicFrameAndArg):
+        (WebCore::jsTestObjPrototypeFunctionWithDynamicFrameAndOptionalArg):
+        (WebCore::jsTestObjPrototypeFunctionWithDynamicFrameAndUserGesture):
+        (WebCore::jsTestObjPrototypeFunctionWithDynamicFrameAndUserGestureASAD):
+
 2010-06-09  MORITA Hajime  <morrita@google.com>
 

trunk/WebCore/bindings/scripts/CodeGeneratorJS.pm

@@ -1870 +1870 @@
                     push(@implContent, GenerateEventListenerCall($className, "remove"));
                 } else {
+                    my $argsIndex = 0;
                     my $paramIndex = 0;
                     my $functionString = ($podType ? "podImp." : "imp->") . $functionImplementationName . "(";
@@ -1908 +1909 @@
                                 $hasOptionalArguments = 1;
                             }
-                            push(@implContent, "    if (argsCount < " . ($paramIndex + 1) . ") {\n");
+                            push(@implContent, "    if (argsCount < " . ($argsIndex + 1) . ") {\n");
                             GenerateImplementationFunctionCall($function, $functionString, $paramIndex, "    " x 2, $podType, $implClassName);
                             push(@implContent, "    }\n\n");
@@ -1917 +1918 @@
                         if ($parameter->type eq "XPathNSResolver") {
                             push(@implContent, "    RefPtr<XPathNSResolver> customResolver;\n");
-                            push(@implContent, "    XPathNSResolver* resolver = toXPathNSResolver(exec->argument($paramIndex));\n");
+                            push(@implContent, "    XPathNSResolver* resolver = toXPathNSResolver(exec->argument($argsIndex));\n");
                             push(@implContent, "    if (!resolver) {\n");
-                            push(@implContent, "        customResolver = JSCustomXPathNSResolver::create(exec, exec->argument($paramIndex));\n");
+                            push(@implContent, "        customResolver = JSCustomXPathNSResolver::create(exec, exec->argument($argsIndex));\n");
                             push(@implContent, "        if (exec->hadException())\n");
                             push(@implContent, "            return JSValue::encode(jsUndefined());\n");
@@ -1925 +1926 @@
                             push(@implContent, "    }\n");
                         } else {
-                            push(@implContent, "    " . GetNativeTypeFromSignature($parameter) . " $name = " . JSValueToNative($parameter, "exec->argument($paramIndex)") . ";\n");
+                            push(@implContent, "    " . GetNativeTypeFromSignature($parameter) . " $name = " . JSValueToNative($parameter, "exec->argument($argsIndex)") . ";\n");
 
                             # If a parameter is "an index" and it's negative it should throw an INDEX_SIZE_ERR exception.
@@ -1946 +1947 @@
                             $functionString .= $name;
                         }
+                        $argsIndex++;
                         $paramIndex++;
                     }

trunk/WebCore/bindings/scripts/test/CPP/WebDOMTestObj.cpp

@@ -399 +399 @@
 }
 
+void WebDOMTestObj::withScriptExecutionContext()
+{
+    if (!impl())
+        return;
+
+    impl()->withScriptExecutionContext();
+}
+
 void WebDOMTestObj::methodWithOptionalArg(int opt)
 {

trunk/WebCore/bindings/scripts/test/CPP/WebDOMTestObj.h

@@ -88 +88 @@
     void withScriptStateVoidException();
     WebDOMTestObj withScriptStateObjException();
+    void withScriptExecutionContext();
     void methodWithOptionalArg(int opt);
     void methodWithNonOptionalArgAndOptionalArg(int nonOpt, int opt);

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

@@ -633 +633 @@
     if (!dynamicFrame)
         return JSValue::encode(jsUndefined());
-    int intArg = exec->argument(1).toInt32(exec);
+    int intArg = exec->argument(0).toInt32(exec);
 
     imp->withDynamicFrameAndArg(dynamicFrame, intArg);
@@ -649 +649 @@
     if (!dynamicFrame)
         return JSValue::encode(jsUndefined());
-    int intArg = exec->argument(1).toInt32(exec);
+    int intArg = exec->argument(0).toInt32(exec);
 
     int argsCount = exec->argumentCount();
-    if (argsCount < 3) {
+    if (argsCount < 2) {
         imp->withDynamicFrameAndOptionalArg(dynamicFrame, intArg);
         return JSValue::encode(jsUndefined());
     }
 
-    int optionalArg = exec->argument(2).toInt32(exec);
+    int optionalArg = exec->argument(1).toInt32(exec);
 
     imp->withDynamicFrameAndOptionalArg(dynamicFrame, intArg, optionalArg);
@@ -673 +673 @@
     if (!dynamicFrame)
         return JSValue::encode(jsUndefined());
-    int intArg = exec->argument(1).toInt32(exec);
+    int intArg = exec->argument(0).toInt32(exec);
 
     imp->withDynamicFrameAndUserGesture(dynamicFrame, intArg, processingUserGesture(exec));
@@ -689 +689 @@
     if (!dynamicFrame)
         return JSValue::encode(jsUndefined());
-    int intArg = exec->argument(1).toInt32(exec);
+    int intArg = exec->argument(0).toInt32(exec);
 
     int argsCount = exec->argumentCount();
-    if (argsCount < 3) {
+    if (argsCount < 2) {
         imp->withDynamicFrameAndUserGestureASAD(dynamicFrame, intArg);
         return JSValue::encode(jsUndefined());
     }
 
-    int optionalArg = exec->argument(2).toInt32(exec);
+    int optionalArg = exec->argument(1).toInt32(exec);
 
     imp->withDynamicFrameAndUserGestureASAD(dynamicFrame, intArg, optionalArg, processingUserGesture(exec));