Changeset 41912 in webkit for trunk/JavaScriptCore/runtime

Timestamp:

Mar 23, 2009, 11:27:22 AM (16 years ago)

Author:

[email protected]

Message:

Provide JavaScript exception information after slow script timeout

Reviewed by Oliver Hunt.

JavaScriptCore:

• runtime/Completion.cpp: (JSC::evaluate): Set the exception object as the Completion object's value for slow script timeouts. This is used in WebCore when reporting the exception.
• runtime/ExceptionHelpers.cpp: (JSC::InterruptedExecutionError::toString): Added. Provides a description message for the exception when it is reported.

WebCore:

• bindings/js/ScriptController.cpp: (WebCore::ScriptController::evaluate): Changed to report exceptions for the Interrupted completion type as well.

Location:

trunk/JavaScriptCore/runtime

Files:

• Completion.cpp (modified) (1 diff)
• ExceptionHelpers.cpp (modified) (1 diff)

trunk/JavaScriptCore/runtime/Completion.cpp

@@ -69 +69 @@
     if (exception) {
         if (exception.isObject() && asObject(exception)->isWatchdogException())
-            return Completion(Interrupted, result);
+            return Completion(Interrupted, exception);
         return Completion(Throw, exception);
     }

trunk/JavaScriptCore/runtime/ExceptionHelpers.cpp

@@ -48 +48 @@
 
     virtual bool isWatchdogException() const { return true; }
+
+    virtual UString toString(ExecState*) const { return "JavaScript execution exceeded timeout."; }
 };