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

[yurys at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit dfecfa1f83a8f446613b9d86e69732385314f034
Author: yurys at chromium.org <yurys at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 29 13:46:49 2010 +0000

    2010-09-29  Yury Semikhatsky  <yurys at chromium.org>
    
            Reviewed by Pavel Feldman.
    
            [v8] Use generic mechanism to report exceptions in V8CustomVoidCallback
            https://bugs.webkit.org/show_bug.cgi?id=46803
    
            No new tests. It's covered by existing tests under LayoutTests/storage
    
            * bindings/v8/custom/V8CustomVoidCallback.cpp:
            (WebCore::invokeCallback):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68641 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index fbeedce..2e5eb85 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-09-29  Yury Semikhatsky  <yurys at chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        [v8] Use generic mechanism to report exceptions in V8CustomVoidCallback
+        https://bugs.webkit.org/show_bug.cgi?id=46803
+
+        No new tests. It's covered by existing tests under LayoutTests/storage
+
+        * bindings/v8/custom/V8CustomVoidCallback.cpp:
+        (WebCore::invokeCallback):
+
 2010-09-29  Satish Sampath  <satish at chromium.org>
 
         Reviewed by Jeremy Orlow.
diff --git a/WebCore/bindings/v8/custom/V8CustomVoidCallback.cpp b/WebCore/bindings/v8/custom/V8CustomVoidCallback.cpp
index 25e7e0d..11f309b 100644
--- a/WebCore/bindings/v8/custom/V8CustomVoidCallback.cpp
+++ b/WebCore/bindings/v8/custom/V8CustomVoidCallback.cpp
@@ -66,6 +66,7 @@ void V8CustomVoidCallback::handleEvent()
 bool invokeCallback(v8::Persistent<v8::Object> callback, int argc, v8::Handle<v8::Value> argv[], bool& callbackReturnValue, ScriptExecutionContext* scriptExecutionContext)
 {
     v8::TryCatch exceptionCatcher;
+    exceptionCatcher.SetVerbose(true);
 
     v8::Local<v8::Function> callbackFunction;
     if (callback->IsFunction()) {
@@ -84,14 +85,7 @@ bool invokeCallback(v8::Persistent<v8::Object> callback, int argc, v8::Handle<v8
 
     v8::Handle<v8::Value> result = callbackFunction->Call(thisObject, argc, argv);
     callbackReturnValue = !result.IsEmpty() && result->BooleanValue();
-
-    if (exceptionCatcher.HasCaught()) {
-        v8::Local<v8::Message> message = exceptionCatcher.Message();
-        scriptExecutionContext->reportException(toWebCoreString(message->Get()), message->GetLineNumber(), toWebCoreString(message->GetScriptResourceName()));
-        return true;
-    }
-
-    return false;
+    return exceptionCatcher.HasCaught();
 }
 
 } // namespace WebCore

-- 
WebKit Debian packaging