Reviewed by NOBODY (OOPS!).

        - Small cleanup in the ServerConnection class.

        * Drosera/win/ServerConnection.cpp: Added comments, moved some functions
        and added an include.
        (ServerConnection::currentFrame):
        (ServerConnection::getCallerFrame):
        * Drosera/win/ServerConnection.h: Added comments, moved some functions,
        made a pointer into a COMPtr, and cleaned up the includes.

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

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 27a49b75b11cf3813367cbfebe0f3e8f9f760806..893e102d500168db360d9e1f18764ad927175540 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,16 @@
+2007-10-30  Kevin McCullough  <kmccullough@apple.com>
+
+        Reviewed by NOBODY (OOPS!).
+
+        - Small cleanup in the ServerConnection class.
+
+        * Drosera/win/ServerConnection.cpp: Added comments, moved some functions
+        and added an include.
+        (ServerConnection::currentFrame):
+        (ServerConnection::getCallerFrame):
+        * Drosera/win/ServerConnection.h: Added comments, moved some functions,
+        made a pointer into a COMPtr, and cleaned up the includes.
+
 2007-10-29  Timothy Hatcher  <timothy@apple.com>
 
         Reviewed by John Sullivan.

diff --git a/WebKitTools/Drosera/win/ServerConnection.cpp b/WebKitTools/Drosera/win/ServerConnection.cpp
index 6b0ae5f1180287c3aaa2b280e8df808e0990767a..c4c04b2fd5e80ea040ea8367a766213e2b61deef 100644 (file)
--- a/WebKitTools/Drosera/win/ServerConnection.cpp
+++ b/WebKitTools/Drosera/win/ServerConnection.cpp
@@ -36,6 +36,8 @@
 #include <JavaScriptCore/JSRetainPtr.h>
 #include <JavaScriptCore/JSStringRefBSTR.h>
 #include <JavaScriptCore/RetainPtr.h>
+#include <WebKit/IWebScriptCallFrame.h>
+#include <WebKit/IWebScriptDebugServer.h>
 #include <WebKit/WebKit.h>
 
 ServerConnection::ServerConnection()
@@ -60,6 +62,8 @@ void ServerConnection::setGlobalContext(JSGlobalContextRef globalContextRef)
     m_globalContext = JSGlobalContextRetain(globalContextRef);
 }
 
+// Pause & Step
+
 void ServerConnection::pause()
 {
     if (m_server)
@@ -92,28 +96,6 @@ void ServerConnection::serverConnectionDidDie()
         m_server->removeListener(this);
 }
 
-// Stack & Variables
-
-IWebScriptCallFrame* ServerConnection::currentFrame() const
-{
-    return m_currentFrame;
-}
-
-IWebScriptCallFrame* ServerConnection::getCallerFrame(int callFrame) const
-{
-    COMPtr<IWebScriptCallFrame> cframe = currentFrame();
-    COMPtr<IWebScriptCallFrame> callerFrame;
-    for (int count = 0; count < callFrame; count++) {
-        if (FAILED(cframe->caller(&callerFrame)))
-            return 0;
-
-        cframe = callerFrame;
-    }
-
-    return cframe.get();
-}
-
-
 // IUnknown --------------------------------------------------
 HRESULT STDMETHODCALLTYPE ServerConnection::QueryInterface(REFIID riid, void** ppvObject)
 {
@@ -272,7 +254,6 @@ HRESULT STDMETHODCALLTYPE ServerConnection::didEnterCallFrame(
     if (!m_globalContext)
         return ret;
 
-    // FIXME: This won't be relevant until IWebScriptCallFrame is implemented on Windows
     m_currentFrame = frame;
 
     JSValueRef sidJS = JSValueMakeNumber(m_globalContext, sourceID);
@@ -317,7 +298,6 @@ HRESULT STDMETHODCALLTYPE ServerConnection::willLeaveCallFrame(
 
     DebuggerDocument::willLeaveCallFrame(m_globalContext, sidJS, linenoJS);
 
-    // FIXME: This won't be relevant until IWebScriptCallFrame is implemented on Windows
     m_currentFrame = frame;
 
     return S_OK;
@@ -341,3 +321,24 @@ HRESULT STDMETHODCALLTYPE ServerConnection::exceptionWasRaised(
 
     return ret;
 }
+
+// Stack & Variables
+
+IWebScriptCallFrame* ServerConnection::currentFrame() const
+{
+    return m_currentFrame.get();
+}
+
+IWebScriptCallFrame* ServerConnection::getCallerFrame(int callFrame) const
+{
+    COMPtr<IWebScriptCallFrame> cframe = currentFrame();
+    COMPtr<IWebScriptCallFrame> callerFrame;
+    for (int count = 0; count < callFrame; count++) {
+        if (FAILED(cframe->caller(&callerFrame)))
+            return 0;
+
+        cframe = callerFrame;
+    }
+
+    return cframe.get();
+}

diff --git a/WebKitTools/Drosera/win/ServerConnection.h b/WebKitTools/Drosera/win/ServerConnection.h
index 7007c1bb92c79a381203f651e255f10a34a13488..0e3140770dde8311a4d161f66f2bdbd73b879938 100644 (file)
--- a/WebKitTools/Drosera/win/ServerConnection.h
+++ b/WebKitTools/Drosera/win/ServerConnection.h
@@ -33,10 +33,10 @@
 #include <string>
 #include <WebCore/COMPtr.h>
 #include <WebKit/IWebScriptDebugListener.h>
-#include <WebKit/IWebScriptDebugServer.h>
 
 class DebuggerClient;
 interface IWebScriptCallFrame;
+interface IWebScriptDebugServer;
 
 typedef struct OpaqueJSContext* JSGlobalContextRef;
 
@@ -46,14 +46,15 @@ public:
     ~ServerConnection();
 
     void setGlobalContext(JSGlobalContextRef);
+
+    // Pause & Step    
     void pause();
     void resume();
     void stepInto();
 
+    // Connection Handling
     void applicationTerminating();
     void serverConnectionDidDie();
-    IWebScriptCallFrame* currentFrame() const;
-    IWebScriptCallFrame* getCallerFrame(int callFrame) const;
 
     // IUnknown
     HRESULT STDMETHODCALLTYPE QueryInterface(
@@ -112,11 +113,14 @@ public:
         /* [in] */ int lineNumber,
         /* [in] */ IWebFrame*);
 
+    // Stack & Variables
+    IWebScriptCallFrame* currentFrame() const;
+    IWebScriptCallFrame* getCallerFrame(int callFrame) const;
+
 private:
     std::wstring m_currentServerName;
 
-    // FIXME: make this a COMPtr when the Interface exists and the destructor can be called.
-    IWebScriptCallFrame* m_currentFrame;
+    COMPtr<IWebScriptCallFrame> m_currentFrame;
     COMPtr<IWebScriptDebugServer> m_server;
     JSGlobalContextRef m_globalContext;
 };