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
+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
#include "WebCoreScriptDebuggerImp.h"
+#include "WebFrameInternal.h"
+#include "WebViewInternal.h"
#include "WebScriptDebugDelegatePrivate.h"
+#include "WebScriptDebugServerPrivate.h"
#include <JavaScriptCore/JSGlobalObject.h>
#include <WebCore/KURL.h>
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;
[super dealloc];
}
+- (WebFrame *)webFrame
+{
+ return _webFrame;
+}
+
- (WebScriptObject *)globalObject
{
return core(_webFrame)->windowScriptObject();
[[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];
}
- (WebScriptDebugger *)initWithWebFrame:(WebFrame *)webFrame;
+- (WebFrame *)webFrame;
- (WebScriptObject *)globalObject; // return the WebView's windowScriptObject
- (WebScriptCallFrame *)enterFrame:(KJS::ExecState*)state;
// 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;