[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 9b3e200d12ff21bf47fc7c234a7a0a485687f961
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 23 15:56:59 2010 +0000

    2010-09-23  Luiz Agostini  <luiz.agostini at 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):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68146 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index d5e9776..24136fd 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-09-23  Luiz Agostini  <luiz.agostini at 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 at igalia.com>
 
         Reviewed by Ariya Hidayat.
diff --git a/WebCore/bindings/js/ScriptFunctionCall.cpp b/WebCore/bindings/js/ScriptFunctionCall.cpp
index 6146712..2e4d536 100644
--- a/WebCore/bindings/js/ScriptFunctionCall.cpp
+++ b/WebCore/bindings/js/ScriptFunctionCall.cpp
@@ -215,8 +215,8 @@ ScriptValue ScriptCallback::call(bool& hadException)
 
     CallData callData;
     CallType callType = getCallData(m_function.jsValue(), callData);
-
-    ASSERT(callType != CallTypeNone);
+    if (callType == CallTypeNone)
+        return ScriptValue();
 
     JSValue result = JSC::call(m_exec, m_function.jsValue(), callType, callData, m_function.jsValue(), m_arguments);
     hadException = m_exec->hadException();

-- 
WebKit Debian packaging