Modified: trunk/WebCore/ChangeLog (68145 => 68146)
--- trunk/WebCore/ChangeLog 2010-09-23 15:51:41 UTC (rev 68145)
+++ trunk/WebCore/ChangeLog 2010-09-23 15:56:59 UTC (rev 68146)
@@ -1,3 +1,15 @@
+2010-09-23 Luiz Agostini <luiz.agostini@openbossa.org>
+
+ Reviewed by Andreas Kling.
+
+ Invalid assertion in ScriptCallback
+ https://bugs.webkit.org/show_bug.cgi?id=46348
+
+ Removing invalid ASSERT from method ScriptCallback::call().
+
+ * bindings/js/ScriptFunctionCall.cpp:
+ (WebCore::ScriptCallback::call):
+
2010-09-23 Martin Robinson <mrobinson@igalia.com>
Reviewed by Ariya Hidayat.
Modified: trunk/WebCore/bindings/js/ScriptFunctionCall.cpp (68145 => 68146)
--- trunk/WebCore/bindings/js/ScriptFunctionCall.cpp 2010-09-23 15:51:41 UTC (rev 68145)
+++ trunk/WebCore/bindings/js/ScriptFunctionCall.cpp 2010-09-23 15:56:59 UTC (rev 68146)
@@ -215,9 +215,9 @@
CallData callData;
CallType callType = getCallData(m_function.jsValue(), callData);
+ if (callType == CallTypeNone)
+ return ScriptValue();
- ASSERT(callType != CallTypeNone);
-
JSValue result = JSC::call(m_exec, m_function.jsValue(), callType, callData, m_function.jsValue(), m_arguments);
hadException = m_exec->hadException();