Changeset 60527 in webkit
- Timestamp:
- Jun 1, 2010 7:38:44 PM (14 years ago)
- Location:
- trunk/WebCore
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r60523 r60527 1 2010-06-01 Andreas Kling <andreas.kling@nokia.com> 2 3 Reviewed by Darin Adler. 4 5 Fix broken code generation in GenerateParametersCheckExpression. 6 https://bugs.webkit.org/show_bug.cgi?id=39960 7 8 * bindings/scripts/CodeGeneratorJS.pm: 9 * bindings/scripts/test/JS/JSTestObj.cpp: Updated baseline. 10 1 11 2010-06-01 Mark Rowe <mrowe@apple.com> 2 12 -
trunk/WebCore/bindings/scripts/CodeGeneratorJS.pm
r60392 r60527 1116 1116 # be converted to a string via .toString). 1117 1117 push(@andExpression, "(${value}.isNull() || ${value}.isUndefined() || ${value}.isString() || ${value}.isObject())") if $codeGenerator->IsStringType($type); 1118 push(@andExpression, "(${value}.isNull() || asObject(${value})->inherits( JS${type}::s_info)") unless IsNativeType($type);1118 push(@andExpression, "(${value}.isNull() || asObject(${value})->inherits(&JS${type}::s_info))") unless IsNativeType($type); 1119 1119 1120 1120 $parameterIndex++; -
trunk/WebCore/bindings/scripts/test/JS/JSTestObj.cpp
r60446 r60527 886 886 JSValue JSC_HOST_CALL jsTestObjPrototypeFunctionOverloadedMethod(ExecState* exec) 887 887 { 888 if ((exec->argumentCount() == 2 && (exec->argument(0).isNull() || asObject(exec->argument(0))->inherits( JSTestObj::s_info) && (exec->argument(1).isNull() || exec->argument(1).isUndefined() || exec->argument(1).isString() || exec->argument(1).isObject())))888 if ((exec->argumentCount() == 2 && (exec->argument(0).isNull() || asObject(exec->argument(0))->inherits(&JSTestObj::s_info)) && (exec->argument(1).isNull() || exec->argument(1).isUndefined() || exec->argument(1).isString() || exec->argument(1).isObject()))) 889 889 return jsTestObjPrototypeFunctionOverloadedMethod1(exec); 890 if ((exec->argumentCount() == 1 && (exec->argument(0).isNull() || asObject(exec->argument(0))->inherits( JSTestObj::s_info)) || (exec->argumentCount() == 2 && (exec->argument(0).isNull() || asObject(exec->argument(0))->inherits(JSTestObj::s_info)))890 if ((exec->argumentCount() == 1 && (exec->argument(0).isNull() || asObject(exec->argument(0))->inherits(&JSTestObj::s_info))) || (exec->argumentCount() == 2 && (exec->argument(0).isNull() || asObject(exec->argument(0))->inherits(&JSTestObj::s_info)))) 891 891 return jsTestObjPrototypeFunctionOverloadedMethod2(exec); 892 892 if ((exec->argumentCount() == 1 && (exec->argument(0).isNull() || exec->argument(0).isUndefined() || exec->argument(0).isString() || exec->argument(0).isObject())))
Note: See TracChangeset
for help on using the changeset viewer.