Reviewed by Adam.

[WebKit-https.git] / WebKitTools / Drosera / win / ServerConnection.h

diff --git a/WebKitTools/Drosera/win/ServerConnection.h b/WebKitTools/Drosera/win/ServerConnection.h
index 2beea4a22ca1e1ca789f3740d4ea00f04517f65e..7007c1bb92c79a381203f651e255f10a34a13488 100644 (file)
--- a/WebKitTools/Drosera/win/ServerConnection.h
+++ b/WebKitTools/Drosera/win/ServerConnection.h
@@ -36,7 +36,7 @@
 #include <WebKit/IWebScriptDebugServer.h>
 
 class DebuggerClient;
 #include <WebKit/IWebScriptDebugServer.h>
 
 class DebuggerClient;

-class WebScriptCallFrame;
+interface IWebScriptCallFrame;

 
 typedef struct OpaqueJSContext* JSGlobalContextRef;
 
 
 typedef struct OpaqueJSContext* JSGlobalContextRef;
 


@@ -52,7 +52,8 @@ public:
 
     void applicationTerminating();
     void serverConnectionDidDie();
 
     void applicationTerminating();
     void serverConnectionDidDie();

-    WebScriptCallFrame* currentFrame() const;
+    IWebScriptCallFrame* currentFrame() const;
+    IWebScriptCallFrame* getCallerFrame(int callFrame) const;

 
     // IUnknown
     HRESULT STDMETHODCALLTYPE QueryInterface(
 
     // IUnknown
     HRESULT STDMETHODCALLTYPE QueryInterface(


@@ -64,57 +65,58 @@ public:
 
     // IWebScriptDebugListener
     HRESULT STDMETHODCALLTYPE didLoadMainResourceForDataSource(
 
     // IWebScriptDebugListener
     HRESULT STDMETHODCALLTYPE didLoadMainResourceForDataSource(

-        /* [in] */ IWebView* view,
+        /* [in] */ IWebView*,

         /* [in] */ IWebDataSource* dataSource);
 
     HRESULT STDMETHODCALLTYPE didParseSource(
         /* [in] */ IWebDataSource* dataSource);
 
     HRESULT STDMETHODCALLTYPE didParseSource(

-        /* [in] */ IWebView* view,
+        /* [in] */ IWebView*,

         /* [in] */ BSTR sourceCode,
         /* [in] */ UINT baseLineNumber,
         /* [in] */ BSTR url,
         /* [in] */ int sourceID,
         /* [in] */ BSTR sourceCode,
         /* [in] */ UINT baseLineNumber,
         /* [in] */ BSTR url,
         /* [in] */ int sourceID,

-        /* [in] */ IWebFrame* forWebFrame);
+        /* [in] */ IWebFrame* webFrame);

 
     HRESULT STDMETHODCALLTYPE failedToParseSource(
 
     HRESULT STDMETHODCALLTYPE failedToParseSource(

-        /* [in] */ IWebView* view,
+        /* [in] */ IWebView*,

         /* [in] */ BSTR sourceCode,
         /* [in] */ UINT baseLineNumber,
         /* [in] */ BSTR url,
         /* [in] */ BSTR error,
         /* [in] */ BSTR sourceCode,
         /* [in] */ UINT baseLineNumber,
         /* [in] */ BSTR url,
         /* [in] */ BSTR error,

-        /* [in] */ IWebFrame* forWebFrame);
+        /* [in] */ IWebFrame*);

 
     HRESULT STDMETHODCALLTYPE didEnterCallFrame(
 
     HRESULT STDMETHODCALLTYPE didEnterCallFrame(

-        /* [in] */ IWebView* view,
+        /* [in] */ IWebView*,

         /* [in] */ IWebScriptCallFrame* frame,
         /* [in] */ int sourceID,
         /* [in] */ int lineNumber,
         /* [in] */ IWebScriptCallFrame* frame,
         /* [in] */ int sourceID,
         /* [in] */ int lineNumber,

-        /* [in] */ IWebFrame* forWebFrame);
+        /* [in] */ IWebFrame*);

 
     HRESULT STDMETHODCALLTYPE willExecuteStatement(
 
     HRESULT STDMETHODCALLTYPE willExecuteStatement(

-        /* [in] */ IWebView* view,
-        /* [in] */ IWebScriptCallFrame* frame,
+        /* [in] */ IWebView*,
+        /* [in] */ IWebScriptCallFrame*,

         /* [in] */ int sourceID,
         /* [in] */ int lineNumber,
         /* [in] */ int sourceID,
         /* [in] */ int lineNumber,

-        /* [in] */ IWebFrame* forWebFrame);
+        /* [in] */ IWebFrame*);

 
     HRESULT STDMETHODCALLTYPE willLeaveCallFrame(
 
     HRESULT STDMETHODCALLTYPE willLeaveCallFrame(

-        /* [in] */ IWebView* view,
+        /* [in] */ IWebView*,

         /* [in] */ IWebScriptCallFrame* frame,
         /* [in] */ int sourceID,
         /* [in] */ int lineNumber,
         /* [in] */ IWebScriptCallFrame* frame,
         /* [in] */ int sourceID,
         /* [in] */ int lineNumber,

-        /* [in] */ IWebFrame* forWebFrame);
+        /* [in] */ IWebFrame*);

 
     HRESULT STDMETHODCALLTYPE exceptionWasRaised(
 
     HRESULT STDMETHODCALLTYPE exceptionWasRaised(

-        /* [in] */ IWebView* view,
-        /* [in] */ IWebScriptCallFrame* frame,
+        /* [in] */ IWebView*,
+        /* [in] */ IWebScriptCallFrame*,

         /* [in] */ int sourceID,
         /* [in] */ int lineNumber,
         /* [in] */ int sourceID,
         /* [in] */ int lineNumber,

-        /* [in] */ IWebFrame* forWebFrame);
+        /* [in] */ IWebFrame*);

 
 private:
     std::wstring m_currentServerName;
 
 
 private:
     std::wstring m_currentServerName;
 

-    WebScriptCallFrame* m_currentFrame;
+    // FIXME: make this a COMPtr when the Interface exists and the destructor can be called.
+    IWebScriptCallFrame* m_currentFrame;

     COMPtr<IWebScriptDebugServer> m_server;
     JSGlobalContextRef m_globalContext;
 };
     COMPtr<IWebScriptDebugServer> m_server;
     JSGlobalContextRef m_globalContext;
 };