Changeset 98617 in webkit

Timestamp:

Oct 27, 2011, 12:22:31 PM (15 years ago)

Author:

podivilov@chromium.org

Message:

Get rid of optional parameters in the middle in IDLs.
​https://bugs.webkit.org/show_bug.cgi?id=70816

Reviewed by Adam Barth.

Optional parameters in the middle are prohibited by WebIDL spec.

Source/WebCore:

• bindings/js/JSCanvasRenderingContext2DCustom.cpp:
• bindings/scripts/CodeGeneratorJS.pm:

(GenerateHeader):
(GenerateImplementation):

• bindings/scripts/CodeGeneratorV8.pm:

(GenerateHeader):
(GenerateArgumentsCountCheck):
(GenerateImplementation):

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

(WebCore::jsTestObjPrototypeFunctionMethodWithNonOptionalArgAndTwoOptionalArgs):

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

(WebCore::TestObjInternal::methodWithNonOptionalArgAndTwoOptionalArgsCallback):

• html/canvas/CanvasRenderingContext2D.idl:
• page/DOMWindow.idl:

LayoutTests:

• fast/canvas/canvas-putImageData-expected.txt: expectation was wrong, context.putImageData({}, 0, 0) should throw Type Error.
• fast/canvas/canvas-putImageData.js:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/canvas/canvas-putImageData-expected.txt (modified) (1 diff)
• LayoutTests/fast/canvas/canvas-putImageData.js (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/bindings/js/JSCanvasRenderingContext2DCustom.cpp (modified) (1 diff)
• Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (modified) (4 diffs)
• Source/WebCore/bindings/scripts/CodeGeneratorV8.pm (modified) (6 diffs)
• Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp (modified) (1 diff)
• Source/WebCore/bindings/scripts/test/TestObj.idl (modified) (1 diff)
• Source/WebCore/bindings/scripts/test/V8/V8TestObj.cpp (modified) (1 diff)
• Source/WebCore/html/canvas/CanvasRenderingContext2D.idl (modified) (3 diffs)
• Source/WebCore/page/DOMWindow.idl (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-10-27  Pavel Podivilov  <podivilov@chromium.org>
+
+        Get rid of optional parameters in the middle in IDLs.
+        https://bugs.webkit.org/show_bug.cgi?id=70816
+
+        Reviewed by Adam Barth.
+
+        Optional parameters in the middle are prohibited by WebIDL spec.
+
+        * fast/canvas/canvas-putImageData-expected.txt: expectation was wrong, context.putImageData({}, 0, 0) should throw Type Error.
+        * fast/canvas/canvas-putImageData.js:
+
 2011-10-27  John Gregg  <johnnyg@google.com>
 

trunk/LayoutTests/fast/canvas/canvas-putImageData-expected.txt

@@ -145 +145 @@
 PASS getPixel(1,1) is [0,128,0,255]
 PASS getPixel(9,9) is [0,128,0,255]
-PASS context.putImageData({}, 0, 0) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
+PASS context.putImageData({}, 0, 0) threw exception TypeError: Type error.
 PASS context.putImageData(buffer, NaN, 0, 0, 0, 0, 0) threw exception Error: NOT_SUPPORTED_ERR: DOM Exception 9.
 PASS context.putImageData(buffer, 0, NaN, 0, 0, 0, 0) threw exception Error: NOT_SUPPORTED_ERR: DOM Exception 9.

trunk/LayoutTests/fast/canvas/canvas-putImageData.js

@@ -202 +202 @@
 
 
-shouldThrow("context.putImageData({}, 0, 0)", "'Error: TYPE_MISMATCH_ERR: DOM Exception 17'");
+shouldThrow("context.putImageData({}, 0, 0)", "'TypeError: Type error'");
 shouldThrow("context.putImageData(buffer, NaN, 0, 0, 0, 0, 0)", "'Error: NOT_SUPPORTED_ERR: DOM Exception 9'");
 shouldThrow("context.putImageData(buffer, 0, NaN, 0, 0, 0, 0)", "'Error: NOT_SUPPORTED_ERR: DOM Exception 9'");

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-10-27  Pavel Podivilov  <podivilov@chromium.org>
+
+        Get rid of optional parameters in the middle in IDLs.
+        https://bugs.webkit.org/show_bug.cgi?id=70816
+
+        Reviewed by Adam Barth.
+
+        Optional parameters in the middle are prohibited by WebIDL spec.
+
+        * bindings/js/JSCanvasRenderingContext2DCustom.cpp:
+        * bindings/scripts/CodeGeneratorJS.pm:
+        (GenerateHeader):
+        (GenerateImplementation):
+        * bindings/scripts/CodeGeneratorV8.pm:
+        (GenerateHeader):
+        (GenerateArgumentsCountCheck):
+        (GenerateImplementation):
+        * bindings/scripts/test/JS/JSTestObj.cpp:
+        (WebCore::jsTestObjPrototypeFunctionMethodWithNonOptionalArgAndTwoOptionalArgs):
+        * bindings/scripts/test/TestObj.idl:
+        * bindings/scripts/test/V8/V8TestObj.cpp:
+        (WebCore::TestObjInternal::methodWithNonOptionalArgAndTwoOptionalArgsCallback):
+        * html/canvas/CanvasRenderingContext2D.idl:
+        * page/DOMWindow.idl:
+
 2011-10-27  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/bindings/js/JSCanvasRenderingContext2DCustom.cpp

@@ -141 +141 @@
 }
 
-JSValue JSCanvasRenderingContext2D::putImageData(ExecState* exec)
-{
-    // putImageData has two variants
-    // putImageData(ImageData, x, y)
-    // putImageData(ImageData, x, y, dirtyX, dirtyY, dirtyWidth, dirtyHeight)
-    CanvasRenderingContext2D* context = static_cast<CanvasRenderingContext2D*>(impl());
-
-    ExceptionCode ec = 0;
-    if (exec->argumentCount() >= 7)
-        context->putImageData(toImageData(exec->argument(0)), exec->argument(1).toFloat(exec), exec->argument(2).toFloat(exec), 
-                              exec->argument(3).toFloat(exec), exec->argument(4).toFloat(exec), exec->argument(5).toFloat(exec), exec->argument(6).toFloat(exec), ec);
-    else
-        context->putImageData(toImageData(exec->argument(0)), exec->argument(1).toFloat(exec), exec->argument(2).toFloat(exec), ec);
-
-    setDOMException(exec, ec);
-    return jsUndefined();
-}
-
 JSValue JSCanvasRenderingContext2D::webkitLineDash(ExecState* exec) const
 {

trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm

@@ -910 +910 @@
         push(@headerContent, "\n    // Custom functions\n");
         foreach my $function (@{$dataNode->functions}) {
-            if ($function->signature->extendedAttributes->{"Custom"} || $function->signature->extendedAttributes->{"JSCCustom"}) {
-                my $functionImplementationName = $function->signature->extendedAttributes->{"ImplementationFunction"} || $codeGenerator->WK_lcfirst($function->signature->name);
-                push(@headerContent, "    JSC::JSValue " . $functionImplementationName . "(JSC::ExecState*);\n");
-            }
+            next unless $function->signature->extendedAttributes->{"Custom"} or $function->signature->extendedAttributes->{"JSCCustom"};
+            next if $function->{overloads} && $function->{overloadIndex} != 1;
+            my $functionImplementationName = $function->signature->extendedAttributes->{"ImplementationFunction"} || $codeGenerator->WK_lcfirst($function->signature->name);
+            push(@headerContent, "    JSC::JSValue " . $functionImplementationName . "(JSC::ExecState*);\n");
         }
     }
@@ -1949 +1949 @@
 
             my $functionName = $codeGenerator->WK_lcfirst($className) . "PrototypeFunction" . $codeGenerator->WK_ucfirst($function->signature->name);
-
-            if ($function->{overloads} && @{$function->{overloads}} > 1) {
+            my $isCustom = $function->signature->extendedAttributes->{"Custom"} || $function->signature->extendedAttributes->{"JSCCustom"};
+            my $isOverloaded = $function->{overloads} && @{$function->{overloads}} > 1;
+
+            next if $isCustom && $isOverloaded && $function->{overloadIndex} > 1;
+
+            if (!$isCustom && $isOverloaded) {
                 # Append a number to an overloaded method's name to make it unique:
                 $functionName = $functionName . $function->{overloadIndex};
@@ -1993 +1997 @@
             }
 
-            if ($function->signature->extendedAttributes->{"Custom"} || $function->signature->extendedAttributes->{"JSCCustom"}) {
+            if ($isCustom) {
                 push(@implContent, "    return JSValue::encode(castedThis->" . $functionImplementationName . "(exec));\n");
             } else {
@@ -2030 +2034 @@
             push(@implContent, "}\n\n");
 
-            if ($function->{overloads} && @{$function->{overloads}} > 1 && $function->{overloadIndex} == @{$function->{overloads}}) {
+            if (!$isCustom && $isOverloaded && $function->{overloadIndex} == @{$function->{overloads}}) {
                 # Generate a function dispatching call to the rest of the overloads.
                 GenerateOverloadedPrototypeFunction($function, $dataNode, $implClassName);

trunk/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm

@@ -265 +265 @@
     # EventTarget.
     $codeGenerator->AddMethodsConstantsAndAttributesFromParentClasses($dataNode, \@allParents, 1);
+    $codeGenerator->LinkOverloadedFunctions($dataNode);
 
     my $hasDependentLifetime = $dataNode->extendedAttributes->{"V8DependentLifetime"} || $dataNode->extendedAttributes->{"ActiveDOMObject"} || $className =~ /SVG/;
@@ -372 +373 @@
         my $attrExt = $function->signature->extendedAttributes;
 
-        if ($attrExt->{"Custom"} || $attrExt->{"V8Custom"}) {
+        if (($attrExt->{"Custom"} || $attrExt->{"V8Custom"}) && $function->{overloadIndex} == 1) {
             push(@headerContent, <<END);
     static v8::Handle<v8::Value> ${name}Callback(const v8::Arguments&);
@@ -1385 +1386 @@
     my $dataNode = shift;
 
+    my $numMandatoryParams = 0;
+    my $optionalSeen = 0;
+    foreach my $param (@{$function->parameters}) {
+        if ($param->extendedAttributes->{"Optional"}) {
+            $optionalSeen = 1;
+        } else {
+            die "An argument must not be declared to be optional unless all subsequent arguments to the operation are also optional." if $optionalSeen;
+            $numMandatoryParams++;
+        }
+    }
+
     my $argumentsCountCheckString = "";
     my $requiresAllArguments;
@@ -1392 +1404 @@
     }
     $requiresAllArguments = $function->signature->extendedAttributes->{"RequiresAllArguments"} || $requiresAllArgumentsDefault;
-    if ($requiresAllArguments) {
-        my $numMandatoryParams = @{$function->parameters};
-        foreach my $param (reverse(@{$function->parameters})) {
-            if ($param->extendedAttributes->{"Optional"}) {
-                $numMandatoryParams--;
-            } else {
-                last;
-            }
-        }
-        if ($numMandatoryParams >= 1) {
-            $argumentsCountCheckString .= "    if (args.Length() < $numMandatoryParams)\n";
-            if ($requiresAllArguments eq "Raise") {
-                $argumentsCountCheckString .= "        return throwError(\"Not enough arguments\", V8Proxy::TypeError);\n";
-            } else {
-                $argumentsCountCheckString .= "        return v8::Handle<v8::Value>();\n";
-            }
+    if ($requiresAllArguments && $numMandatoryParams >= 1) {
+        $argumentsCountCheckString .= "    if (args.Length() < $numMandatoryParams)\n";
+        if ($requiresAllArguments eq "Raise") {
+            $argumentsCountCheckString .= "        return throwError(\"Not enough arguments\", V8Proxy::TypeError);\n";
+        } else {
+            $argumentsCountCheckString .= "        return v8::Handle<v8::Value>();\n";
         }
     }
@@ -2006 +2008 @@
     }
 
-    $codeGenerator->LinkOverloadedFunctions($dataNode);
-
     my $indexer;
     my $namedPropertyGetter;
     # Generate methods for functions.
     foreach my $function (@{$dataNode->functions}) {
-        if (!($function->signature->extendedAttributes->{"Custom"} || $function->signature->extendedAttributes->{"V8Custom"})) {
+        my $isCustom = $function->signature->extendedAttributes->{"Custom"} || $function->signature->extendedAttributes->{"V8Custom"};
+        if (!$isCustom) {
             GenerateFunctionCallback($function, $dataNode, $implClassName);
             if ($function->{overloadIndex} > 1 && $function->{overloadIndex} == @{$function->{overloads}}) {
@@ -2031 +2032 @@
         # for different calling context.
         if (($dataNode->extendedAttributes->{"CheckDomainSecurity"} || ($interfaceName eq "DOMWindow")) && $function->signature->extendedAttributes->{"DoNotCheckDomainSecurity"}) {
-            GenerateDomainSafeFunctionGetter($function, $implClassName);
+            if (!$isCustom || $function->{overloadIndex} == 1) {
+                GenerateDomainSafeFunctionGetter($function, $implClassName);
+            }
         }
     }

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

@@ -1557 +1557 @@
     if (exec->hadException())
         return JSValue::encode(jsUndefined());
+    if (argsCount <= 2) {
+        imp->methodWithNonOptionalArgAndTwoOptionalArgs(nonOpt, opt1);
+        return JSValue::encode(jsUndefined());
+    }
+
     int opt2(exec->argument(2).toInt32(exec));
     if (exec->hadException())

trunk/Source/WebCore/bindings/scripts/test/TestObj.idl

@@ -120 +120 @@
         void    methodWithOptionalArg(in [Optional] long opt);
         void    methodWithNonOptionalArgAndOptionalArg(in long nonOpt, in [Optional] long opt);
-        void    methodWithNonOptionalArgAndTwoOptionalArgs(in long nonOpt, in [Optional] long opt1, in long opt2);
+        void    methodWithNonOptionalArgAndTwoOptionalArgs(in long nonOpt, in [Optional] long opt1, in [Optional] long opt2);
 
 #if defined(TESTING_V8) || defined(TESTING_JS)

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

@@ -1043 +1043 @@
     }
     EXCEPTION_BLOCK(int, opt1, toInt32(MAYBE_MISSING_PARAMETER(args, 1, MissingIsUndefined)));
+    if (args.Length() <= 2) {
+        imp->methodWithNonOptionalArgAndTwoOptionalArgs(nonOpt, opt1);
+        return v8::Handle<v8::Value>();
+    }
     EXCEPTION_BLOCK(int, opt2, toInt32(MAYBE_MISSING_PARAMETER(args, 2, MissingIsUndefined)));
     imp->methodWithNonOptionalArgAndTwoOptionalArgs(nonOpt, opt1, opt2);

trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.idl

@@ -153 +153 @@
         void setShadow(in float width, in float height, in float blur, in float c, in float m, in float y, in float k, in float a);
 
+        void putImageData(in ImageData imagedata, in float dx, in float dy)
+            raises(DOMException);
+        void putImageData(in ImageData imagedata, in float dx, in float dy, in float dirtyX, in float dirtyY, in float dirtyWidth, in float dirtyHeight)
+            raises(DOMException);
+
 #if defined(V8_BINDING) && V8_BINDING
         CanvasPattern createPattern(in HTMLCanvasElement canvas, in [ConvertNullToNullString] DOMString repetitionType)
@@ -158 +163 @@
         CanvasPattern createPattern(in HTMLImageElement image, in [ConvertNullToNullString] DOMString repetitionType)
             raises (DOMException);
-        void putImageData(in ImageData imagedata, in float dx, in float dy, in [Optional] float dirtyX, in float dirtyY, in float dirtyWidth, in float dirtyHeight)
-            raises(DOMException);
         ImageData createImageData(in ImageData imagedata)
             raises (DOMException);
@@ -167 +170 @@
         // FIXME: Remove 'else' once JSC supports overloads too.
         [Custom] void createPattern(/* 2 */);
-        [Custom] void putImageData(/* in ImageData imagedata, in float dx, in float dy [, in float dirtyX, in float dirtyY, in float dirtyWidth, in float dirtyHeight] */);
         [Custom] ImageData createImageData(/* 3 */);
 #endif // defined(V8_BINDING)

trunk/Source/WebCore/page/DOMWindow.idl

@@ -213 +213 @@
         // cross-document messaging
 #if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
-        [DoNotCheckDomainSecurity, Custom] void postMessage(in SerializedScriptValue message, in [Optional] Array messagePorts, in DOMString targetOrigin)
+        [DoNotCheckDomainSecurity, Custom] void postMessage(in SerializedScriptValue message, in DOMString targetOrigin)
             raises(DOMException);
-        [DoNotCheckDomainSecurity, Custom] void webkitPostMessage(in SerializedScriptValue message, in [Optional] Array transferList, in DOMString targetOrigin)
+        [DoNotCheckDomainSecurity, Custom] void postMessage(in SerializedScriptValue message, in Array messagePorts, in DOMString targetOrigin)
+            raises(DOMException);
+
+        [DoNotCheckDomainSecurity, Custom] void webkitPostMessage(in SerializedScriptValue message, in DOMString targetOrigin)
+            raises(DOMException);
+        [DoNotCheckDomainSecurity, Custom] void webkitPostMessage(in SerializedScriptValue message, in Array transferList, in DOMString targetOrigin)
             raises(DOMException);
 #else