Remove -[WebScriptDebugger hitStatement:sourceId:line:]

        Reviewed by Kevin M.

        * WebView/WebCoreScriptDebuggerImp.mm:
        (WebCoreScriptDebuggerImp::atStatement): Moved code here from
        -[WebScriptDebugger hitStatement:sourceId:line:].
        * WebView/WebScriptDebugDelegate.mm:
        (-[WebScriptDebugger webFrame]): Added.
        * WebView/WebScriptDebugDelegatePrivate.h:

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

diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index 0f8685c69479955f325aa7fb44726477c31c1f33..5954c4ccfc5d7cda4075c71757aa66efd94f7749 100644 (file)
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,16 @@
+2008-03-05  Adam Roben  <aroben@apple.com>
+
+        Remove -[WebScriptDebugger hitStatement:sourceId:line:]
+
+        Reviewed by Kevin M.
+
+        * WebView/WebCoreScriptDebuggerImp.mm:
+        (WebCoreScriptDebuggerImp::atStatement): Moved code here from
+        -[WebScriptDebugger hitStatement:sourceId:line:].
+        * WebView/WebScriptDebugDelegate.mm:
+        (-[WebScriptDebugger webFrame]): Added.
+        * WebView/WebScriptDebugDelegatePrivate.h:
+
 2008-03-05  Adam Roben  <aroben@apple.com>
 
         Remove WebCoreScriptDebugger

diff --git a/WebKit/mac/WebView/WebCoreScriptDebuggerImp.mm b/WebKit/mac/WebView/WebCoreScriptDebuggerImp.mm
index d3ec36354bbf06bd2dd974cb2063d2f06a68070d..d8994d228496582555262a38d1e238348e41b1e7 100644 (file)
--- a/WebKit/mac/WebView/WebCoreScriptDebuggerImp.mm
+++ b/WebKit/mac/WebView/WebCoreScriptDebuggerImp.mm
@@ -30,7 +30,10 @@
 
 #include "WebCoreScriptDebuggerImp.h"
 
+#include "WebFrameInternal.h"
+#include "WebViewInternal.h"
 #include "WebScriptDebugDelegatePrivate.h"
+#include "WebScriptDebugServerPrivate.h"
 #include <JavaScriptCore/JSGlobalObject.h>
 #include <WebCore/KURL.h>
 
@@ -95,7 +98,13 @@ bool WebCoreScriptDebuggerImp::atStatement(ExecState* state, int sourceID, int l
         return true;
 
     m_callingDelegate = true;
-    [m_debugger hitStatement:m_topCallFrame sourceId:sourceID line:lineNumber];
+
+    WebFrame *webFrame = [m_debugger webFrame];
+    WebView *webView = [webFrame webView];
+    [[webView _scriptDebugDelegateForwarder] webView:webView willExecuteStatement:m_topCallFrame sourceId:sourceID line:lineNumber forWebFrame:webFrame];
+    if ([WebScriptDebugServer listenerCount])
+        [[WebScriptDebugServer sharedScriptDebugServer] webView:webView willExecuteStatement:m_topCallFrame sourceId:sourceID line:lineNumber forWebFrame:webFrame];
+
     m_callingDelegate = false;
 
     return true;

diff --git a/WebKit/mac/WebView/WebScriptDebugDelegate.mm b/WebKit/mac/WebView/WebScriptDebugDelegate.mm
index 40c5b99e0dd28268e86920cc54b097acd7780547..82ce80d7e6d41c435c93e57c0d1ff3d986497e3b 100644 (file)
--- a/WebKit/mac/WebView/WebScriptDebugDelegate.mm
+++ b/WebKit/mac/WebView/WebScriptDebugDelegate.mm
@@ -76,6 +76,11 @@ NSString * const WebScriptErrorLineNumberKey = @"WebScriptErrorLineNumber";
     [super dealloc];
 }
 
+- (WebFrame *)webFrame
+{
+    return _webFrame;
+}
+
 - (WebScriptObject *)globalObject
 {
     return core(_webFrame)->windowScriptObject();
@@ -121,14 +126,6 @@ NSString * const WebScriptErrorLineNumberKey = @"WebScriptErrorLineNumber";
         [[WebScriptDebugServer sharedScriptDebugServer] webView:webView didEnterCallFrame:frame sourceId:sid line:lineno forWebFrame:_webFrame];
 }
 
-- (void)hitStatement:(WebScriptCallFrame *)frame sourceId:(int)sid line:(int)lineno
-{
-    WebView *webView = [_webFrame webView];
-    [[webView _scriptDebugDelegateForwarder] webView:webView willExecuteStatement:frame sourceId:sid line:lineno forWebFrame:_webFrame];
-    if ([WebScriptDebugServer listenerCount])
-        [[WebScriptDebugServer sharedScriptDebugServer] webView:webView willExecuteStatement:frame sourceId:sid line:lineno forWebFrame:_webFrame];
-}
-
 - (void)leavingFrame:(WebScriptCallFrame *)frame sourceId:(int)sid line:(int)lineno
 {
     WebView *webView = [_webFrame webView];

diff --git a/WebKit/mac/WebView/WebScriptDebugDelegatePrivate.h b/WebKit/mac/WebView/WebScriptDebugDelegatePrivate.h
index 601b6cc608f2ea96015f4c907caa049e69f403c0..12afc043806db25d63a8fd865d0ef974648068a8 100644 (file)
--- a/WebKit/mac/WebView/WebScriptDebugDelegatePrivate.h
+++ b/WebKit/mac/WebView/WebScriptDebugDelegatePrivate.h
@@ -42,6 +42,7 @@ class WebCoreScriptDebuggerImp;
 }
 
 - (WebScriptDebugger *)initWithWebFrame:(WebFrame *)webFrame;
+- (WebFrame *)webFrame;
 
 - (WebScriptObject *)globalObject;                          // return the WebView's windowScriptObject
 - (WebScriptCallFrame *)enterFrame:(KJS::ExecState*)state;
@@ -50,7 +51,6 @@ class WebCoreScriptDebuggerImp;
 // debugger callbacks
 - (void)parsedSource:(NSString *)source fromURL:(NSURL *)url sourceId:(int)sid startLine:(int)startLine errorLine:(int)errorLine errorMessage:(NSString *)errorMessage;
 - (void)enteredFrame:(WebScriptCallFrame *)frame sourceId:(int)sid line:(int)lineno;
-- (void)hitStatement:(WebScriptCallFrame *)frame sourceId:(int)sid line:(int)lineno;
 - (void)leavingFrame:(WebScriptCallFrame *)frame sourceId:(int)sid line:(int)lineno;
 - (void)exceptionRaised:(WebScriptCallFrame *)frame sourceId:(int)sid line:(int)lineno;