Changeset 61937 in webkit

Timestamp:

Jun 25, 2010 8:40:09 PM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-06-25 Sterling Swigart <​sswigart@google.com>

Reviewed by David Levin.

Callback code generation fixed so that now string parameters are converted to JSString
using the jsString method instead of the toJS method which would not compile.
​https://bugs.webkit.org/show_bug.cgi?id=41119

• bindings/scripts/CodeGeneratorJS.pm: Now generates jsString for String parameters in callbacks.
• bindings/scripts/test/JS/JSTestCallback.cpp: Fixed test for above. (WebCore::JSTestCallback::callbackWithClass2Param): Ditto.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/scripts/CodeGeneratorJS.pm (modified) (1 diff)
• bindings/scripts/test/JS/JSTestCallback.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-06-25  Sterling Swigart  <sswigart@google.com>
+
+        Reviewed by David Levin.
+
+        Callback code generation fixed so that now string parameters are converted to JSString
+        using the jsString method instead of the toJS method which would not compile.
+        https://bugs.webkit.org/show_bug.cgi?id=41119
+        
+        * bindings/scripts/CodeGeneratorJS.pm: Now generates jsString for String parameters in callbacks.
+        * bindings/scripts/test/JS/JSTestCallback.cpp: Fixed test for above.
+        (WebCore::JSTestCallback::callbackWithClass2Param): Ditto.
+
 2010-06-25  Zhenyao Mo  <zmo@google.com>
 

trunk/WebCore/bindings/scripts/CodeGeneratorJS.pm

@@ -2180 +2180 @@
             foreach my $param (@params) {
                 my $paramName = $param->name;
-                push(@implContent, "    args.append(toJS(exec, ${paramName}));\n");
+                if ($param->type eq "DOMString") {
+                    push(@implContent, "    args.append(jsString(exec, ${paramName}));\n");
+                } else {
+                    push(@implContent, "    args.append(toJS(exec, ${paramName}));\n");
+                }
             }
 

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

@@ -90 +90 @@
     MarkedArgumentBuffer args;
     args.append(toJS(exec, class2Param));
-    args.append(toJS(exec, strArg));
+    args.append(jsString(exec, strArg));
 
     bool raisedException = false;