2011-02-03 Anton Muhin <antonm@chromium.org>

        Reviewed by Adam Barth.

        [v8] frame several more JS code invocations into v8::TryCatch
        https://bugs.webkit.org/show_bug.cgi?id=53594

        This patch is preemptive and adjusts v8 bindings code to forthcoming small change
        in v8::ThrowException---currently sometimes exceptions thrown by this method
        do not reach surrounding v8::TryCatch handler (see
        http://code.google.com/p/v8/issues/detail?id=1072 and
        http://codereview.chromium.org/6397011/).  Therefore the goal of this patch
        is to make forthcoming v8 roll as smooth as possible (alas, we'll still need
        one rebaseline as of now.)

        * bindings/v8/V8Proxy.cpp:
        (WebCore::V8Proxy::runScript): Do not rely on empty handle as a signal of exception, wrap into v8::TryCatch instead
        * bindings/v8/V8WindowErrorHandler.cpp:
        (WebCore::V8WindowErrorHandler::callListenerFunction): Ditto

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@77613 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index bef1534177a184c054f5222732eeb3b45059736e..075a5dfd56c5e243395dd87f7b455ebff1c1c48b 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,23 @@
+2011-02-03  Anton Muhin  <antonm@chromium.org>
+
+        Reviewed by Adam Barth.
+
+        [v8] frame several more JS code invocations into v8::TryCatch
+        https://bugs.webkit.org/show_bug.cgi?id=53594
+
+        This patch is preemptive and adjusts v8 bindings code to forthcoming small change
+        in v8::ThrowException---currently sometimes exceptions thrown by this method
+        do not reach surrounding v8::TryCatch handler (see
+        http://code.google.com/p/v8/issues/detail?id=1072 and
+        http://codereview.chromium.org/6397011/).  Therefore the goal of this patch
+        is to make forthcoming v8 roll as smooth as possible (alas, we'll still need
+        one rebaseline as of now.)
+
+        * bindings/v8/V8Proxy.cpp:
+        (WebCore::V8Proxy::runScript): Do not rely on empty handle as a signal of exception, wrap into v8::TryCatch instead
+        * bindings/v8/V8WindowErrorHandler.cpp:
+        (WebCore::V8WindowErrorHandler::callListenerFunction): Ditto
+
 2011-02-03  Maciej Stachowiak  <mjs@apple.com>
 
         Reviewed by Dan Bernstein.

diff --git a/Source/WebCore/bindings/v8/V8Proxy.cpp b/Source/WebCore/bindings/v8/V8Proxy.cpp
index 5d094826e9d9b51ef6c4db9954153573819301d4..d90cf1c081b59d9851de762854a5ffaf539ed864 100644 (file)
--- a/Source/WebCore/bindings/v8/V8Proxy.cpp
+++ b/Source/WebCore/bindings/v8/V8Proxy.cpp
@@ -407,6 +407,8 @@ v8::Local<v8::Value> V8Proxy::runScript(v8::Handle<v8::Script> script, bool isIn
 
     // Run the script and keep track of the current recursion depth.
     v8::Local<v8::Value> result;
+    v8::TryCatch tryCatch;
+    tryCatch.SetVerbose(true);
     {
         // See comment in V8Proxy::callFunction.
         m_frame->keepAlive();
@@ -423,6 +425,11 @@ v8::Local<v8::Value> V8Proxy::runScript(v8::Handle<v8::Script> script, bool isIn
         ASSERT(result.IsEmpty());
 
     // Handle V8 internal error situation (Out-of-memory).
+    if (tryCatch.HasCaught()) {
+        ASSERT(result.IsEmpty());
+        return notHandledByInterceptor();
+    }
+
     if (result.IsEmpty())
         return notHandledByInterceptor();
 

diff --git a/Source/WebCore/bindings/v8/V8WindowErrorHandler.cpp b/Source/WebCore/bindings/v8/V8WindowErrorHandler.cpp
index 4203ad5c239ccc8083af33cfc9ed42035d408afd..e33a183f05207895664907761079a632dad3047f 100644 (file)
--- a/Source/WebCore/bindings/v8/V8WindowErrorHandler.cpp
+++ b/Source/WebCore/bindings/v8/V8WindowErrorHandler.cpp
@@ -54,8 +54,10 @@ v8::Local<v8::Value> V8WindowErrorHandler::callListenerFunction(ScriptExecutionC
         v8::Local<v8::Function> callFunction = v8::Local<v8::Function>::Cast(listener);
         v8::Local<v8::Object> thisValue = v8::Context::GetCurrent()->Global();
         v8::Handle<v8::Value> parameters[3] = { v8String(errorEvent->message()), v8String(errorEvent->filename()), v8::Integer::New(errorEvent->lineno()) };
+        v8::TryCatch tryCatch;
+        tryCatch.SetVerbose(true);
         returnValue = callFunction->Call(thisValue, 3, parameters);
-        if (!returnValue.IsEmpty() && returnValue->IsBoolean() && !returnValue->BooleanValue())
+        if (!tryCatch.HasCaught() && !returnValue.IsEmpty() && returnValue->IsBoolean() && !returnValue->BooleanValue())
             event->preventDefault();
     }
     return returnValue;