Title: [87390] trunk/Source/WebCore
- Revision
- 87390
- Author
- [email protected]
- Date
- 2011-05-26 09:05:43 -0700 (Thu, 26 May 2011)
Log Message
2011-05-26 Andreas Kling <[email protected]>
Reviewed by Benjamin Poulain.
JSC DOM bindings: ExecState::argumentCount() is size_t, not int.
https://bugs.webkit.org/show_bug.cgi?id=61530
* bindings/scripts/CodeGeneratorJS.pm:
* bindings/scripts/test/JS/JSTestObj.cpp:
(WebCore::jsTestObjPrototypeFunctionOptionsObject):
(WebCore::jsTestObjPrototypeFunctionWithDynamicFrameAndOptionalArg):
(WebCore::jsTestObjPrototypeFunctionWithDynamicFrameAndUserGestureASAD):
(WebCore::jsTestObjPrototypeFunctionMethodWithOptionalArg):
(WebCore::jsTestObjPrototypeFunctionMethodWithNonOptionalArgAndOptionalArg):
(WebCore::jsTestObjPrototypeFunctionMethodWithNonOptionalArgAndTwoOptionalArgs):
(WebCore::jsTestObjPrototypeFunctionOverloadedMethod2):
(WebCore::jsTestObjPrototypeFunctionClassMethodWithOptional):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (87389 => 87390)
--- trunk/Source/WebCore/ChangeLog 2011-05-26 15:56:47 UTC (rev 87389)
+++ trunk/Source/WebCore/ChangeLog 2011-05-26 16:05:43 UTC (rev 87390)
@@ -1,3 +1,21 @@
+2011-05-26 Andreas Kling <[email protected]>
+
+ Reviewed by Benjamin Poulain.
+
+ JSC DOM bindings: ExecState::argumentCount() is size_t, not int.
+ https://bugs.webkit.org/show_bug.cgi?id=61530
+
+ * bindings/scripts/CodeGeneratorJS.pm:
+ * bindings/scripts/test/JS/JSTestObj.cpp:
+ (WebCore::jsTestObjPrototypeFunctionOptionsObject):
+ (WebCore::jsTestObjPrototypeFunctionWithDynamicFrameAndOptionalArg):
+ (WebCore::jsTestObjPrototypeFunctionWithDynamicFrameAndUserGestureASAD):
+ (WebCore::jsTestObjPrototypeFunctionMethodWithOptionalArg):
+ (WebCore::jsTestObjPrototypeFunctionMethodWithNonOptionalArgAndOptionalArg):
+ (WebCore::jsTestObjPrototypeFunctionMethodWithNonOptionalArgAndTwoOptionalArgs):
+ (WebCore::jsTestObjPrototypeFunctionOverloadedMethod2):
+ (WebCore::jsTestObjPrototypeFunctionClassMethodWithOptional):
+
2011-05-26 Simon Fraser <[email protected]>
Reviewed by Adam Roben.
Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (87389 => 87390)
--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2011-05-26 15:56:47 UTC (rev 87389)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2011-05-26 16:05:43 UTC (rev 87390)
@@ -1984,7 +1984,7 @@
if ($parameter->extendedAttributes->{"Optional"} && !$parameter->extendedAttributes->{"Callback"}) {
# Generate early call if there are enough parameters.
if (!$hasOptionalArguments) {
- push(@implContent, "\n int argsCount = exec->argumentCount();\n");
+ push(@implContent, "\n size_t argsCount = exec->argumentCount();\n");
$hasOptionalArguments = 1;
}
push(@implContent, " if (argsCount <= $argsIndex) {\n");
Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp (87389 => 87390)
--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2011-05-26 15:56:47 UTC (rev 87389)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2011-05-26 16:05:43 UTC (rev 87390)
@@ -1094,7 +1094,7 @@
if (exec->hadException())
return JSValue::encode(jsUndefined());
- int argsCount = exec->argumentCount();
+ size_t argsCount = exec->argumentCount();
if (argsCount <= 1) {
imp->optionsObject(oo);
return JSValue::encode(jsUndefined());
@@ -1244,7 +1244,7 @@
if (exec->hadException())
return JSValue::encode(jsUndefined());
- int argsCount = exec->argumentCount();
+ size_t argsCount = exec->argumentCount();
if (argsCount <= 1) {
imp->withDynamicFrameAndOptionalArg(dynamicFrame, intArg);
return JSValue::encode(jsUndefined());
@@ -1292,7 +1292,7 @@
if (exec->hadException())
return JSValue::encode(jsUndefined());
- int argsCount = exec->argumentCount();
+ size_t argsCount = exec->argumentCount();
if (argsCount <= 1) {
imp->withDynamicFrameAndUserGestureASAD(dynamicFrame, intArg);
return JSValue::encode(jsUndefined());
@@ -1393,7 +1393,7 @@
ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestObj::s_info);
TestObj* imp = static_cast<TestObj*>(castedThis->impl());
- int argsCount = exec->argumentCount();
+ size_t argsCount = exec->argumentCount();
if (argsCount <= 0) {
imp->methodWithOptionalArg();
return JSValue::encode(jsUndefined());
@@ -1419,7 +1419,7 @@
if (exec->hadException())
return JSValue::encode(jsUndefined());
- int argsCount = exec->argumentCount();
+ size_t argsCount = exec->argumentCount();
if (argsCount <= 1) {
imp->methodWithNonOptionalArgAndOptionalArg(nonOpt);
return JSValue::encode(jsUndefined());
@@ -1445,7 +1445,7 @@
if (exec->hadException())
return JSValue::encode(jsUndefined());
- int argsCount = exec->argumentCount();
+ size_t argsCount = exec->argumentCount();
if (argsCount <= 1) {
imp->methodWithNonOptionalArgAndTwoOptionalArgs(nonOpt);
return JSValue::encode(jsUndefined());
@@ -1553,7 +1553,7 @@
if (exec->hadException())
return JSValue::encode(jsUndefined());
- int argsCount = exec->argumentCount();
+ size_t argsCount = exec->argumentCount();
if (argsCount <= 1) {
imp->overloadedMethod(objArg);
return JSValue::encode(jsUndefined());
@@ -1654,7 +1654,7 @@
ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestObj::s_info);
TestObj* imp = static_cast<TestObj*>(castedThis->impl());
- int argsCount = exec->argumentCount();
+ size_t argsCount = exec->argumentCount();
if (argsCount <= 0) {
JSC::JSValue result = jsNumber(imp->classMethodWithOptional());
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes