Modified: trunk/Source/WebCore/ChangeLog (143307 => 143308)
--- trunk/Source/WebCore/ChangeLog 2013-02-19 08:55:32 UTC (rev 143307)
+++ trunk/Source/WebCore/ChangeLog 2013-02-19 09:00:37 UTC (rev 143308)
@@ -1,5 +1,14 @@
2013-02-19 Kentaro Hara <[email protected]>
+ Unreviewed build fix. Fixed warning caused by r143305.
+
+ * bindings/scripts/CodeGeneratorJS.pm:
+ (GenerateParametersCheck):
+ * bindings/scripts/CodeGeneratorV8.pm:
+ (GenerateParametersCheck):
+
+2013-02-19 Kentaro Hara <[email protected]>
+
Unreviewed build fix after r143304.
* bindings/js/JSDOMBinding.h:
Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (143307 => 143308)
--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2013-02-19 08:55:32 UTC (rev 143307)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2013-02-19 09:00:37 UTC (rev 143308)
@@ -2755,7 +2755,7 @@
}
}
- push(@$outputArray, " " . GetNativeTypeFromSignature($parameter) . " $name(" . JSValueToNative($parameter, $optional eq "DefaultIsNullString" ? "argumentOrNull(exec, $argsIndex)" : "exec->argument($argsIndex)") . ");\n");
+ push(@$outputArray, " " . GetNativeTypeFromSignature($parameter) . " $name(" . JSValueToNative($parameter, $optional && $optional eq "DefaultIsNullString" ? "argumentOrNull(exec, $argsIndex)" : "exec->argument($argsIndex)") . ");\n");
# If a parameter is "an index" and it's negative it should throw an INDEX_SIZE_ERR exception.
# But this needs to be done in the bindings, because the type is unsigned and the fact that it
Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm (143307 => 143308)
--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm 2013-02-19 08:55:32 UTC (rev 143307)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm 2013-02-19 09:00:37 UTC (rev 143308)
@@ -1812,7 +1812,7 @@
$parameterCheckString .= " V8TRYCATCH(Vector<$nativeElementType>, $parameterName, toNativeArguments<$nativeElementType>(args, $paramIndex));\n";
}
} elsif ($nativeType =~ /^V8StringResource/) {
- my $value = JSValueToNative($parameter, $optional eq "DefaultIsNullString" ? "argumentOrNull(args, $paramIndex)" : "args[$paramIndex]", "args.GetIsolate()");
+ my $value = JSValueToNative($parameter, $optional && $optional eq "DefaultIsNullString" ? "argumentOrNull(args, $paramIndex)" : "args[$paramIndex]", "args.GetIsolate()");
$parameterCheckString .= " " . ConvertToV8StringResource($parameter, $nativeType, $parameterName, $value) . "\n";
} else {
# If the "StrictTypeChecking" extended attribute is present, and the argument's type is an
@@ -1830,7 +1830,7 @@
}
}
$parameterCheckString .= " V8TRYCATCH($nativeType, $parameterName, " .
- JSValueToNative($parameter, $optional eq "DefaultIsNullString" ? "argumentOrNull(args, $paramIndex)" : "args[$paramIndex]", "args.GetIsolate()") . ");\n";
+ JSValueToNative($parameter, $optional && $optional eq "DefaultIsNullString" ? "argumentOrNull(args, $paramIndex)" : "args[$paramIndex]", "args.GetIsolate()") . ");\n";
if ($nativeType eq 'Dictionary') {
$parameterCheckString .= " if (!$parameterName.isUndefinedOrNull() && !$parameterName.isObject())\n";
$parameterCheckString .= " return throwTypeError(\"Not an object.\", args.GetIsolate());\n";
