It is unfortunate that this fix changes unused code. Will it be covered by existing layout tests when ScriptFunctionCall and ScriptCallback start being used? The patch and bug were highly confusing. Without any explanation of why this assertion was wrong, a test case, or an explanation of why one can't be made, I had to spend considerable time figuring out why it shouldn't be rolled out immediately. - WBR, Alexey Proskuryakov Начало переадресованного сообщения:
От: commit-queue@webkit.org Дата: 23 сентября 2010 г. 8:57:01 Тихоокеанское летнее время Кому: webkit-changes@lists.webkit.org Тема: [webkit-changes] [68146] trunk/WebCore
Revision 68146 Author commit-queue@webkit.org Date 2010-09-23 08:56:59 -0700 (Thu, 23 Sep 2010) Log Message
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): Modified Paths
trunk/WebCore/ChangeLog trunk/WebCore/bindings/js/ScriptFunctionCall.cpp Diff
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();
_______________________________________________ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes