Changeset 14904 in webkit for trunk/JavaScriptCore/kjs/interpreter.cpp

Timestamp:

Jun 18, 2006, 10:11:51 AM (19 years ago)

Author:

andersca

Message:

JavaScriptCore:

2006-06-18 Anders Carlsson <​[email protected]>

Reviewed by Geoff.

• kjs/interpreter.cpp: (KJS::TimeoutChecker::pauseTimeoutCheck): Do nothing if the timeout check hasn't been started.

(KJS::TimeoutChecker::resumeTimeoutCheck):
Do nothing if the timeout check hasn't been started.
Use the right signal handler when unblocking.

(KJS::Interpreter::handleTimeout):
pause/resume the timeout check around the call to
shouldInterruptScript().

WebCore:

2006-06-17 Anders Carlsson <​[email protected]>

Reviewed by Geoff.

• bindings/js/kjs_binding.cpp: (KJS::ScriptInterpreter::ScriptInterpreter): Set the default script timeout.

(KJS::ScriptInterpreter::shouldInterruptScript):
New function which asks the frame if the script should be interrupted.

• bindings/js/kjs_binding.h:

• bindings/js/kjs_events.cpp: (KJS::JSAbstractEventListener::handleEvent):
• bindings/js/kjs_proxy.cpp: (WebCore::KJSProxy::evaluate): Add calls to startTimeoutCheck/stopTimeoutCheck

• bindings/js/kjs_window.cpp: (KJS::WindowFunc::callAsFunction): Add calls to pauseTimeoutCheck/unpauseTimeoutCheck

(KJS::ScheduledAction::execute):
Add calls to startTimeoutCheck/stopTimeoutCheck

• bridge/mac/FrameMac.h:
• bridge/mac/FrameMac.mm: (WebCore::FrameMac::shouldInterruptJavaScript): New function which asks the bridge if the script should be interrupted.

• bridge/mac/WebCoreFrameBridge.h:
• page/Frame.h: Add function declarations.

WebKit:

2006-06-18 Anders Carlsson <​[email protected]>

Reviewed by Geoff.

• WebCoreSupport/WebFrameBridge.m: (-[WebFrameBridge shouldInterruptJavaScript]): Ask the UI delegate if the script should be interrupted.

• WebView/WebUIDelegatePrivate.h: Declare webViewShouldInterruptJavaScript: delegate method

File:

• trunk/JavaScriptCore/kjs/interpreter.cpp (modified) (4 diffs)

trunk/JavaScriptCore/kjs/interpreter.cpp

@@ -143 +143 @@
 void TimeoutChecker::pauseTimeoutCheck(Interpreter* interpreter)
 {
-#if HAVE(SYS_TIME_H)
+    if (interpreter->m_startTimeoutCheckCount == 0)
+        return;
+
+#if HAVE(SYS_TIME_H)    
     ASSERT(interpreter == s_executingInterpreter);
 
@@ -164 +167 @@
 void TimeoutChecker::resumeTimeoutCheck(Interpreter* interpreter)
 {
+    if (interpreter->m_startTimeoutCheckCount == 0)
+        return;
+
 #if HAVE(SYS_TIME_H)
     ASSERT(interpreter == s_executingInterpreter);
@@ -187 +193 @@
 
     // Unblock signal
-    currentSignalHandler = signal(SIGALRM, SIG_IGN);    
+    currentSignalHandler = signal(SIGALRM, alarmHandler);    
 #endif
 }
@@ -802 +808 @@
 {
     m_timedOut = false;
-    
-    return shouldInterruptScript();
+
+    pauseTimeoutCheck();
+    bool retval = shouldInterruptScript();
+    resumeTimeoutCheck();
+    
+    return retval;
 }