Reviewed by Sam.
authorkmccullough@apple.com <kmccullough@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 29 Nov 2007 18:36:57 +0000 (18:36 +0000)
committerkmccullough@apple.com <kmccullough@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 29 Nov 2007 18:36:57 +0000 (18:36 +0000)
        - Added recursive runloop guards.

        * DefaultDelegates/WebScriptDebugServer.m:
        (-[WebScriptDebugServer suspendProcessIfPaused]):

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

WebKit/mac/ChangeLog
WebKit/mac/DefaultDelegates/WebScriptDebugServer.m

index e6b0a52274609432d3fcd61e9ada31ee369a9b2c..955c1d86c9b48840a7969ec1076b0856489d9e55 100644 (file)
@@ -1,3 +1,12 @@
+2007-11-28  Kevin McCullough  <kmccullough@apple.com>
+
+        Reviewed by Sam.
+
+        - Added recursive runloop guards.
+
+        * DefaultDelegates/WebScriptDebugServer.m:
+        (-[WebScriptDebugServer suspendProcessIfPaused]):
+
 2007-11-29  Mark Rowe  <mrowe@apple.com>
 
         Reviewed by Oliver Hunt.
index 596e7198e7843d9e16d71c16aec529be56ad3c43..2cd0e8f8ed31ea0e3a214a3c23d332d45b57ce1a 100644 (file)
@@ -203,6 +203,13 @@ static unsigned listenerCount = 0;
 
 - (void)suspendProcessIfPaused
 {
+    static BOOL alreadyHere = NO;
+    
+    if (alreadyHere)
+        return;
+
+    alreadyHere = YES;
+
     // this method will suspend this process when called during the dubugging callbacks
     // we need to do this to implement breakpoints and pausing of JavaScript
 
@@ -213,6 +220,8 @@ static unsigned listenerCount = 0;
         step = NO;
         paused = YES;
     }
+    
+    alreadyHere = NO;
 }
 
 - (void)webView:(WebView *)webView didLoadMainResourceForDataSource:(WebDataSource *)dataSource