Reviewed by Adam.

        - This patch does two main things.
        1) It adds pragma warning guards around WebCore includes in WebKit files
        that were previously overlooked.
        2) It implements almost the entireity of WebScriptDebugger.  Only one
        function remains and that implementation is dependent on finishing the
        implementation of WebScriptScope.

        * WebScriptCallFrame.h:
        * WebScriptDebugServer.h:
        * WebScriptDebugger.cpp:
        (WebScriptDebugger::WebScriptDebugger):
        (WebScriptDebugger::sourceParsed):
        (WebScriptDebugger::callEvent):
        (WebScriptDebugger::atStatement):
        (WebScriptDebugger::returnEvent):
        (WebScriptDebugger::exception):
        (WebScriptDebugger::enterFrame):
        (WebScriptDebugger::leaveFrame):
        * WebScriptDebugger.h:

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

diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index 4251a2a6b42d8fec0a3a87270cd5c6545c947d9b..8460a829678fd1a8e561724e298243bed8a89540 100644 (file)
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,27 @@
+2007-11-08  Kevin McCullough  <kmccullough@apple.com>
+
+        Reviewed by Adam.
+
+        - This patch does two main things.
+        1) It adds pragma warning guards around WebCore includes in WebKit files
+        that were previously overlooked.
+        2) It implements almost the entireity of WebScriptDebugger.  Only one
+        function remains and that implementation is dependent on finishing the
+        implementation of WebScriptScope.
+
+        * WebScriptCallFrame.h:
+        * WebScriptDebugServer.h:
+        * WebScriptDebugger.cpp:
+        (WebScriptDebugger::WebScriptDebugger):
+        (WebScriptDebugger::sourceParsed):
+        (WebScriptDebugger::callEvent):
+        (WebScriptDebugger::atStatement):
+        (WebScriptDebugger::returnEvent):
+        (WebScriptDebugger::exception):
+        (WebScriptDebugger::enterFrame):
+        (WebScriptDebugger::leaveFrame):
+        * WebScriptDebugger.h:
+
 2007-11-08  Steve Falkenburg  <sfalken@apple.com>
 
         <rdar://problem/5491463> Wrong dates shown in History menu.

diff --git a/WebKit/win/WebScriptCallFrame.h b/WebKit/win/WebScriptCallFrame.h
index 338cc2bb4e2784867c6b88ff45880503eb3ea325..27578d9b8340a16fe9e2ba964844f09be01a91c0 100644 (file)
--- a/WebKit/win/WebScriptCallFrame.h
+++ b/WebKit/win/WebScriptCallFrame.h
@@ -32,7 +32,9 @@
 #include "IWebScriptCallFrame.h"
 
 #include <JavaScriptCore/ExecState.h>
+#pragma warning(push, 0)
 #include <WebCore/COMPtr.h>
+#pragma warning(pop)
 
 class WebScriptCallFrame : public IWebScriptCallFrame {
 public:

diff --git a/WebKit/win/WebScriptDebugServer.h b/WebKit/win/WebScriptDebugServer.h
index b4279829593a07cdbf4a52a847981257e542a249..9b953b1a39c52d44d33b2a9723744150386e7b3d 100644 (file)
--- a/WebKit/win/WebScriptDebugServer.h
+++ b/WebKit/win/WebScriptDebugServer.h
@@ -30,7 +30,9 @@
 
 #include "IWebScriptDebugListener.h"
 #include <wtf/HashSet.h>
+#pragma warning(push, 0)
 #include <WebCore/COMPtr.h>
+#pragma warning(pop)
 
 interface IWebView;
 

diff --git a/WebKit/win/WebScriptDebugger.cpp b/WebKit/win/WebScriptDebugger.cpp
index 03ba0de9841cb98f1d5284da0fac0e05b3606a5d..d75c1362ff433d7c2c0bcad37d1e63feb970e02f 100644 (file)
--- a/WebKit/win/WebScriptDebugger.cpp
+++ b/WebKit/win/WebScriptDebugger.cpp
@@ -34,38 +34,45 @@
 #include "WebFrame.h"
 #include "WebScriptDebugServer.h"
 
+#pragma warning(push, 0)
 #include <WebCore/BString.h>
 #include <WebCore/kjs_binding.h>
 #include <WebCore/kjs_proxy.h>
 #include <WebCore/PlatformString.h>
-
-#include <WebCore/COMPtr.h>
+#pragma warning(pop)
 
 using namespace WebCore;
+using namespace KJS;
 
 WebScriptDebugger::WebScriptDebugger(WebFrame* frame)
     : m_frame(frame)
 {
     ASSERT(m_frame);
-    if (KJSProxy* proxy = core(m_frame)->scriptProxy())
-        attach(static_cast<KJS::Interpreter*>(proxy->interpreter()));
+
+    KJSProxy* proxy = core(m_frame)->scriptProxy();
+    if (!proxy)
+        return;
+
+    Interpreter* interp(proxy->interpreter());
+    attach(interp);
+
+    m_frame->webView(&m_webView);
+    ASSERT(m_webView);
+
+    callEvent(interp->globalExec(), -1, -1, 0, List());
 }
 
-bool WebScriptDebugger::sourceParsed(KJS::ExecState*, int sourceId, const KJS::UString& sourceURL,
-                  const KJS::UString& source, int startingLineNumber, int errorLine, const KJS::UString& /*errorMsg*/)
+bool WebScriptDebugger::sourceParsed(ExecState*, int sourceId, const UString& sourceURL,
+                  const UString& source, int startingLineNumber, int errorLine, const UString& /*errorMsg*/)
 {
     if (WebScriptDebugServer::listenerCount() <= 0)
         return true;
 
-    COMPtr<IWebView> webView;
-    if (FAILED(m_frame->webView(&webView)))
-        return false;
-
     BString bSource = String(source);
     BString bSourceURL = String(sourceURL);
     
     if (errorLine == -1) {
-        WebScriptDebugServer::sharedWebScriptDebugServer()->didParseSource(webView.get(),
+        WebScriptDebugServer::sharedWebScriptDebugServer()->didParseSource(m_webView.get(),
             bSource,
             startingLineNumber,
             bSourceURL,
@@ -75,7 +82,7 @@ bool WebScriptDebugger::sourceParsed(KJS::ExecState*, int sourceId, const KJS::U
         // FIXME: the error var should be made with the information in the errorMsg.  It is not a simple
         // UString to BSTR conversion there is some logic involved that I don't fully understand yet.
         BString error(L"An Error Occurred.");
-        WebScriptDebugServer::sharedWebScriptDebugServer()->failedToParseSource(webView.get(),
+        WebScriptDebugServer::sharedWebScriptDebugServer()->failedToParseSource(m_webView.get(),
             bSource,
             startingLineNumber,
             bSourceURL,
@@ -86,3 +93,48 @@ bool WebScriptDebugger::sourceParsed(KJS::ExecState*, int sourceId, const KJS::U
     return true;
 }
 
+bool WebScriptDebugger::callEvent(ExecState* state, int sourceId, int lineno, JSObject* /*function*/, const List &/*args*/)\r
+{\r
+    enterFrame(state);\r
+    WebScriptDebugServer::sharedWebScriptDebugServer()->didEnterCallFrame(m_webView.get(), m_topStackFrame.get(), sourceId, lineno, m_frame);\r
+\r
+    return true;\r
+}\r
+\r
+bool WebScriptDebugger::atStatement(ExecState*, int sourceId, int firstLine, int /*lastLine*/)\r
+{\r
+    WebScriptDebugServer::sharedWebScriptDebugServer()->willExecuteStatement(m_webView.get(), m_topStackFrame.get(), sourceId, firstLine, m_frame);\r
+\r
+    return true;\r
+}\r
+\r
+bool WebScriptDebugger::returnEvent(ExecState*, int sourceId, int lineno, JSObject* /*function*/)
+{\r
+    WebScriptDebugServer::sharedWebScriptDebugServer()->willLeaveCallFrame(m_webView.get(), m_topStackFrame.get(), sourceId, lineno, m_frame);\r
+    leaveFrame();\r
+    return true;\r
+}\r
+\r
+bool WebScriptDebugger::exception(ExecState*, int sourceId, int lineno, JSValue* /*exception */)\r
+{\r
+    WebScriptDebugServer::sharedWebScriptDebugServer()->exceptionWasRaised(m_webView.get(), m_topStackFrame.get(), sourceId, lineno, m_frame);\r
+\r
+    return true;\r
+}\r
+\r
+void WebScriptDebugger::enterFrame(ExecState*)\r
+{\r
+    // FIXME: the implementation of this is dependent on finishing the implementation of WebScriptScope.\r
+}\r
+\r
+void WebScriptDebugger::leaveFrame()\r
+{\r
+    if (!m_topStackFrame)\r
+        return;\r
+\r
+    COMPtr<IWebScriptCallFrame> caller;\r
+    if (FAILED(m_topStackFrame->caller(&caller)))\r
+        return;\r
+\r
+    m_topStackFrame = caller;\r
+}\r

diff --git a/WebKit/win/WebScriptDebugger.h b/WebKit/win/WebScriptDebugger.h
index 14c7c93599b70eb4c6b4885c5c9b63d5769d7f24..9812606d16131b9a34b223737d37eca28a7a42cd 100644 (file)
--- a/WebKit/win/WebScriptDebugger.h
+++ b/WebKit/win/WebScriptDebugger.h
@@ -29,12 +29,22 @@
 #ifndef WebScriptDebugger_H
 #define WebScriptDebugger_H
 
+#include "IWebView.h"
+#include "IWebScriptCallFrame.h"
+
 #include <JavaScriptCore/debugger.h>
+#pragma warning(push, 0)
+#include <WebCore/COMPtr.h>
+#pragma warning(pop)
 
 class WebFrame;
+interface IWebScriptCallFrame;
 
 namespace KJS {
     class ExecState;
+    class JSObject;
+    class JSValue;
+    class List;
 }
 
 class WebScriptDebugger : public KJS::Debugger {
@@ -44,8 +54,18 @@ public:
     bool sourceParsed(KJS::ExecState*, int sourceId, const KJS::UString& sourceURL,
         const KJS::UString& source, int startingLineNumber, int errorLine, const KJS::UString& errorMsg);
 
+    bool callEvent(KJS::ExecState*, int sourceId, int lineno, KJS::JSObject* function, const KJS::List& args);
+    bool atStatement(KJS::ExecState*, int sourceId, int firstLine, int lastLine);
+    bool returnEvent(KJS::ExecState*, int sourceId, int lineno, KJS::JSObject* function);
+    bool exception(KJS::ExecState*, int sourceId, int lineno, KJS::JSValue* exception);
+
 private:
+    void enterFrame(KJS::ExecState*);
+    void leaveFrame();
+
     WebFrame* m_frame;
+    COMPtr<IWebView> m_webView;
+    COMPtr<IWebScriptCallFrame> m_topStackFrame; 
 };
 
 #endif