WebKit/win:

        Reviewed by Sam.

        - <rdar://5618976> Drosera: should listen for the WebScriptDebugServer
        dying and vice versa.

        * Interfaces/IWebScriptDebugListener.idl: Added the new function to the
        interface.
        * WebKit.vcproj/WebKit.def: Added the new function to the def file so
        Safari can tell WebKit when the server is dying.
        * WebKit.vcproj/WebKit_debug.def: Ditto.
        * WebKitDLL.cpp: Added the new function for Safari to call.
        (RunAsLocalServer):
        (LocalServerDidDie):
        * WebScriptDebugServer.cpp:
        (WebScriptDebugServer::WebScriptDebugServer): Removed unused member.
        (WebScriptDebugServer::sharedWebScriptDebugServer): Ditto, and added new
        member to prevent adding or removing listeners when the server is dying.
        (WebScriptDebugServer::addListener): Don't let new listeners be added
        when the server is dying.
        (WebScriptDebugServer::removeListener): Don't let listeners remove
        themselves when the server is dying.  The server will remove them all
        anyways.
        (WebScriptDebugServer::serverDidDie): Notify all listeners that the
        server is dying and remove all listeners.
        * WebScriptDebugServer.h: Added the new method and removed an unused
        member.

WebKitTools:

        Reviewed by Sam.

        - <rdar://5618976> Drosera: should listen for the WebScriptDebugServer
        dying and vice versa.
        - This fix will allow Drosera and Safari to reconnect if either of them
        closes correctly, but does not fix the case where one of them dies
        silently.

        * Drosera/win/ServerConnection.cpp:
        (ServerConnection::attemptToCreateServerConnection): Added a safety
        check, because it's possilbe to try to connect to a server that's dying.
        (ServerConnection::serverDidDie): Implemented. This resets Drosera when
        the server has died.
        * Drosera/win/ServerConnection.h: Added the new function and removed
        an unnecessary member.

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

diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index 39312df85f0916245b768420c8bc3cfbf24e9f60..97c1d13b2f8c9e69d0e02f1dfddc197dfade69c3 100644 (file)
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,32 @@
+2007-11-29  Kevin McCullough  <kmccullough@apple.com>
+
+        Reviewed by Sam.
+
+        - <rdar://5618976> Drosera: should listen for the WebScriptDebugServer
+        dying and vice versa.
+
+        * Interfaces/IWebScriptDebugListener.idl: Added the new function to the
+        interface.
+        * WebKit.vcproj/WebKit.def: Added the new function to the def file so
+        Safari can tell WebKit when the server is dying.
+        * WebKit.vcproj/WebKit_debug.def: Ditto.
+        * WebKitDLL.cpp: Added the new function for Safari to call.
+        (RunAsLocalServer):
+        (LocalServerDidDie):
+        * WebScriptDebugServer.cpp: 
+        (WebScriptDebugServer::WebScriptDebugServer): Removed unused member.
+        (WebScriptDebugServer::sharedWebScriptDebugServer): Ditto, and added new
+        member to prevent adding or removing listeners when the server is dying.
+        (WebScriptDebugServer::addListener): Don't let new listeners be added
+        when the server is dying.
+        (WebScriptDebugServer::removeListener): Don't let listeners remove
+        themselves when the server is dying.  The server will remove them all
+        anyways.
+        (WebScriptDebugServer::serverDidDie): Notify all listeners that the
+        server is dying and remove all listeners.
+        * WebScriptDebugServer.h: Added the new method and removed an unused
+        member.
+
 2007-11-29  Brady Eidson  <beidson@apple.com>
 
         Build fix that works...?

diff --git a/WebKit/win/Interfaces/IWebScriptDebugListener.idl b/WebKit/win/Interfaces/IWebScriptDebugListener.idl
index 1aa28f0cba540bfa2310cc99fd90de591ce43621..a37f4ca6faca9edf62701c73965a10fc7d4adb31 100644 (file)
--- a/WebKit/win/Interfaces/IWebScriptDebugListener.idl
+++ b/WebKit/win/Interfaces/IWebScriptDebugListener.idl
@@ -75,4 +75,5 @@ interface IWebScriptDebugListener : IUnknown
     HRESULT willExecuteStatement([in] IWebView* view, [in] IWebScriptCallFrame* frame, [in] int sourceID, [in] int lineNumber, [in] IWebFrame* forWebFrame);
     HRESULT willLeaveCallFrame([in] IWebView* view, [in] IWebScriptCallFrame* frame, [in] int sourceID, [in] int lineNumber, [in] IWebFrame* forWebFrame);
     HRESULT exceptionWasRaised([in] IWebView* view, [in] IWebScriptCallFrame* frame, [in] int sourceID, [in] int lineNumber, [in] IWebFrame* forWebFrame);
+    HRESULT serverDidDie();
 }

diff --git a/WebKit/win/WebKit.vcproj/WebKit.def b/WebKit/win/WebKit.vcproj/WebKit.def
index 5882efa8a2a6275ba7b9a52b8ed28c1f413bd763..a5e14fcafebbc8cea02ab3ef54f771f91d36e76d 100644 (file)
--- a/WebKit/win/WebKit.vcproj/WebKit.def
+++ b/WebKit/win/WebKit.vcproj/WebKit.def
@@ -6,6 +6,7 @@ EXPORTS
         DllRegisterServer   PRIVATE
         DllUnregisterServer PRIVATE
         RunAsLocalServer    PRIVATE
+        LocalServerDidDie   PRIVATE
            JSCheckScriptSyntax
            JSClassCreate
            JSClassRelease

diff --git a/WebKit/win/WebKit.vcproj/WebKit_debug.def b/WebKit/win/WebKit.vcproj/WebKit_debug.def
index daad5a4df15e7d61257bf7cc633aed3c49096968..9da2e1f846a2e50cb778fae9a8806cb30b42613c 100644 (file)
--- a/WebKit/win/WebKit.vcproj/WebKit_debug.def
+++ b/WebKit/win/WebKit.vcproj/WebKit_debug.def
@@ -6,6 +6,7 @@ EXPORTS
         DllRegisterServer   PRIVATE
         DllUnregisterServer PRIVATE
         RunAsLocalServer    PRIVATE
+        LocalServerDidDie   PRIVATE
         JSCheckScriptSyntax
         JSClassCreate
         JSClassRelease

diff --git a/WebKit/win/WebKitDLL.cpp b/WebKit/win/WebKitDLL.cpp
index 7d91f8981b3f7998a07397a60c41efa46e76c876..9de991d8411a6856d70a15cdb9d1d2387f062a6f 100644 (file)
--- a/WebKit/win/WebKitDLL.cpp
+++ b/WebKit/win/WebKitDLL.cpp
@@ -31,6 +31,7 @@
 #include "ProgIDMacros.h"
 #include "WebKit.h"
 #include "WebKitClassFactory.h"
+#include "WebScriptDebugServer.h"
 #include "resource.h"
 #pragma warning( push, 0 )
 #include <WebCore/COMPtr.h>
@@ -257,7 +258,7 @@ STDAPI DllRegisterServer(void)
     return hr;
 }
 
-STDAPI RunAsLocalServer(void)
+STDAPI RunAsLocalServer()
 {
     DWORD reg;
     COMPtr<IUnknown> classFactory;
@@ -266,6 +267,12 @@ STDAPI RunAsLocalServer(void)
     return 0;
 }
 
+STDAPI LocalServerDidDie()
+{
+    WebScriptDebugServer::sharedWebScriptDebugServer()->serverDidDie();
+    return 0;
+}
+
 //FIXME: We should consider moving this to a new file for cross-project functionality
 PassRefPtr<WebCore::SharedBuffer> loadResourceIntoBuffer(const char* name)
 {

diff --git a/WebKit/win/WebScriptDebugServer.cpp b/WebKit/win/WebScriptDebugServer.cpp
index c20beb47ff023757f3cfa3f351ce181d3c1f7156..463da5d35ff4c569dffa5303f7f2ab172229cbea 100644 (file)
--- a/WebKit/win/WebScriptDebugServer.cpp
+++ b/WebKit/win/WebScriptDebugServer.cpp
@@ -37,6 +37,7 @@ typedef HashSet<COMPtr<IWebScriptDebugListener> > ListenerSet;
 static ListenerSet s_Listeners;
 static unsigned s_ListenerCount = 0;
 static OwnPtr<WebScriptDebugServer> s_SharedWebScriptDebugServer;
+static bool s_dying = false;
 
 unsigned WebScriptDebugServer::listenerCount() { return s_ListenerCount; };
 
@@ -46,7 +47,6 @@ WebScriptDebugServer::WebScriptDebugServer()
     : m_refCount(0)
     , m_paused(false)
     , m_step(false)
-    , m_sharedInstance(false)
 {
     gClassCount++;
 }
@@ -66,8 +66,8 @@ WebScriptDebugServer* WebScriptDebugServer::createInstance()
 WebScriptDebugServer* WebScriptDebugServer::sharedWebScriptDebugServer()
 {
     if (!s_SharedWebScriptDebugServer) {
+        s_dying = false;
         s_SharedWebScriptDebugServer.set(WebScriptDebugServer::createInstance());
-        s_SharedWebScriptDebugServer->m_sharedInstance = true;
     }
 
     return s_SharedWebScriptDebugServer.get();
@@ -121,6 +121,9 @@ HRESULT STDMETHODCALLTYPE WebScriptDebugServer::sharedWebScriptDebugServer(
 HRESULT STDMETHODCALLTYPE WebScriptDebugServer::addListener(
     /* [in] */ IWebScriptDebugListener* listener)
 {
+    if (s_dying)
+        return E_FAIL;
+
     if (!listener)
         return E_POINTER;
 
@@ -133,6 +136,9 @@ HRESULT STDMETHODCALLTYPE WebScriptDebugServer::addListener(
 HRESULT STDMETHODCALLTYPE WebScriptDebugServer::removeListener(
     /* [in] */ IWebScriptDebugListener* listener)
 {
+    if (s_dying)
+        return S_OK;
+
     if (!listener)
         return E_POINTER;
 
@@ -194,7 +200,6 @@ void WebScriptDebugServer::suspendProcessIfPaused()
 
     MSG msg;
     while (m_paused && GetMessage(&msg, 0, 0, 0)) {
-        // FIXME: Listen for Drosera dying. You will get removeListener calls but what if it crashes?
         TranslateMessage(&msg);
         DispatchMessage(&msg);
     }
@@ -216,7 +221,8 @@ HRESULT STDMETHODCALLTYPE WebScriptDebugServer::didLoadMainResourceForDataSource
         return E_FAIL;
 
     ListenerSet listenersCopy = s_Listeners;
-    for (ListenerSet::iterator it = listenersCopy.begin(); it != listenersCopy.end(); ++it)
+    ListenerSet::iterator end = listenersCopy.end();
+    for (ListenerSet::iterator it = listenersCopy.begin(); it != end; ++it)
         (**it).didLoadMainResourceForDataSource(webView, dataSource);
 
     return S_OK;
@@ -234,7 +240,8 @@ HRESULT STDMETHODCALLTYPE WebScriptDebugServer::didParseSource(
         return E_FAIL;
 
     ListenerSet listenersCopy = s_Listeners;
-    for (ListenerSet::iterator it = listenersCopy.begin(); it != listenersCopy.end(); ++it)
+    ListenerSet::iterator end = listenersCopy.end();
+    for (ListenerSet::iterator it = listenersCopy.begin(); it != end; ++it)
         (**it).didParseSource(webView, sourceCode, baseLineNumber, url, sourceID, webFrame);
 
     return S_OK;
@@ -252,7 +259,8 @@ HRESULT STDMETHODCALLTYPE WebScriptDebugServer::failedToParseSource(
         return E_FAIL;
 
     ListenerSet listenersCopy = s_Listeners;
-    for (ListenerSet::iterator it = listenersCopy.begin(); it != listenersCopy.end(); ++it)
+    ListenerSet::iterator end = listenersCopy.end();
+    for (ListenerSet::iterator it = listenersCopy.begin(); it != end; ++it)
         (**it).failedToParseSource(webView, sourceCode, baseLineNumber, url, error, webFrame);
 
     return S_OK;
@@ -269,7 +277,8 @@ HRESULT STDMETHODCALLTYPE WebScriptDebugServer::didEnterCallFrame(
         return E_FAIL;
 
     ListenerSet listenersCopy = s_Listeners;
-    for (ListenerSet::iterator it = listenersCopy.begin(); it != listenersCopy.end(); ++it)
+    ListenerSet::iterator end = listenersCopy.end();
+    for (ListenerSet::iterator it = listenersCopy.begin(); it != end; ++it)
         (**it).didEnterCallFrame(webView, frame, sourceID, lineNumber, webFrame);
 
     suspendProcessIfPaused();
@@ -288,7 +297,8 @@ HRESULT STDMETHODCALLTYPE WebScriptDebugServer::willExecuteStatement(
         return E_FAIL;
 
     ListenerSet listenersCopy = s_Listeners;
-    for (ListenerSet::iterator it = listenersCopy.begin(); it != listenersCopy.end(); ++it)
+    ListenerSet::iterator end = listenersCopy.end();
+    for (ListenerSet::iterator it = listenersCopy.begin(); it != end; ++it)
         (**it).willExecuteStatement(webView, frame, sourceID, lineNumber, webFrame);
 
     suspendProcessIfPaused();
@@ -307,7 +317,8 @@ HRESULT STDMETHODCALLTYPE WebScriptDebugServer::willLeaveCallFrame(
         return E_FAIL;
 
     ListenerSet listenersCopy = s_Listeners;
-    for (ListenerSet::iterator it = listenersCopy.begin(); it != listenersCopy.end(); ++it)
+    ListenerSet::iterator end = listenersCopy.end();
+    for (ListenerSet::iterator it = listenersCopy.begin(); it != end; ++it)
         (**it).willLeaveCallFrame(webView, frame, sourceID, lineNumber, webFrame);
 
     suspendProcessIfPaused();
@@ -326,7 +337,8 @@ HRESULT STDMETHODCALLTYPE WebScriptDebugServer::exceptionWasRaised(
         return E_FAIL;
 
     ListenerSet listenersCopy = s_Listeners;
-    for (ListenerSet::iterator it = listenersCopy.begin(); it != listenersCopy.end(); ++it)
+    ListenerSet::iterator end = listenersCopy.end();
+    for (ListenerSet::iterator it = listenersCopy.begin(); it != end; ++it)
         (**it).exceptionWasRaised(webView, frame, sourceID, lineNumber, webFrame);
 
     suspendProcessIfPaused();
@@ -334,3 +346,16 @@ HRESULT STDMETHODCALLTYPE WebScriptDebugServer::exceptionWasRaised(
     return S_OK;
 }
 
+HRESULT STDMETHODCALLTYPE WebScriptDebugServer::serverDidDie()
+{
+    s_dying = true;
+
+    ListenerSet listenersCopy = s_Listeners;
+    ListenerSet::iterator end = listenersCopy.end();
+    for (ListenerSet::iterator it = listenersCopy.begin(); it != end; ++it) {
+        (**it).serverDidDie();
+        s_Listeners.remove((*it).get());
+    }
+
+    return S_OK;
+}

diff --git a/WebKit/win/WebScriptDebugServer.h b/WebKit/win/WebScriptDebugServer.h
index 5c9ffdaa61bba90e50f4ff53ad060a30c071320e..e7a695f82c11625b256a212a300f0c5d2708c8be 100644 (file)
--- a/WebKit/win/WebScriptDebugServer.h
+++ b/WebKit/win/WebScriptDebugServer.h
@@ -125,13 +125,14 @@ public:
         /* [in] */ int lineNumber,
         /* [in] */ IWebFrame*);
 
+    virtual HRESULT STDMETHODCALLTYPE serverDidDie();
+
     void suspendProcessIfPaused();
     static unsigned listenerCount();
 
 private:
     bool m_paused;
     bool m_step;
-    bool m_sharedInstance;
 
     ULONG m_refCount;
 };

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index ab6b12a64d7ad65f62b6b8dde9eb9b24a19a318a..dc0b00aa63a805867ea006753cebf979e3d9d1be 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,8 +1,26 @@
+2007-11-29  Kevin McCullough  <kmccullough@apple.com>
+
+        Reviewed by Sam.
+
+        - <rdar://5618976> Drosera: should listen for the WebScriptDebugServer
+        dying and vice versa.
+        - This fix will allow Drosera and Safari to reconnect if either of them
+        closes correctly, but does not fix the case where one of them dies
+        silently.
+
+        * Drosera/win/ServerConnection.cpp:
+        (ServerConnection::attemptToCreateServerConnection): Added a safety
+        check, because it's possilbe to try to connect to a server that's dying.
+        (ServerConnection::serverDidDie): Implemented. This resets Drosera when
+        the server has died.
+        * Drosera/win/ServerConnection.h: Added the new function and removed
+        an unnecessary member.
+
 2007-11-29  Anders Carlsson  <andersca@apple.com>
 
         * DumpRenderTree/win/DumpRenderTree.vcproj:
         Add shlwapi.lib to all configurations.
-        
+
 2007-11-29  Kevin McCullough  <kmccullough@apple.com>
 
         - Build fix.  Added additional includes for VS Express to the Release

diff --git a/WebKitTools/Drosera/win/DebuggerDocumentPlatform.cpp b/WebKitTools/Drosera/win/DebuggerDocumentPlatform.cpp
index 6b616b9365f381d6c48e60f2b1075c39045fd04e..c8a7043a708d3ff32cc524544ee6bd9ff7e28982 100644 (file)
--- a/WebKitTools/Drosera/win/DebuggerDocumentPlatform.cpp
+++ b/WebKitTools/Drosera/win/DebuggerDocumentPlatform.cpp
@@ -113,7 +113,7 @@ void DebuggerDocument::getPlatformCurrentFunctionStack(JSContextRef context, Vec
 
 void DebuggerDocument::getPlatformLocalScopeVariableNamesForCallFrame(JSContextRef context, int callFrame, Vector<JSValueRef>& variableNames)
 {
-    // FIXME: Move the retrieval of local variables into IWebScriptCallFrame to reduce the number of RPCs and simplify the code.
+    // FIXME: <rdar://5619005> Move the retrieval of local variables into IWebScriptCallFrame to reduce the number of RPCs and simplify the code.
     COMPtr<IWebScriptCallFrame> cframe = m_server->getCallerFrame(callFrame);
     if (!cframe)
         return;

diff --git a/WebKitTools/Drosera/win/ServerConnection.cpp b/WebKitTools/Drosera/win/ServerConnection.cpp
index 2a5ddac7f3f9835d9ec38824416de8476d627aca..8313ba5a5dc710a81dbeec828a350de8d99699cb 100644 (file)
--- a/WebKitTools/Drosera/win/ServerConnection.cpp
+++ b/WebKitTools/Drosera/win/ServerConnection.cpp
@@ -66,8 +66,10 @@ void ServerConnection::attemptToCreateServerConnection(JSGlobalContextRef global
         if (FAILED(tempServer->sharedWebScriptDebugServer(&m_server)))
             return;
 
-        if (FAILED(m_server->addListener(this)))
+        if (FAILED(m_server->addListener(this))) {
+            m_server = 0;
             return;
+        }
 
         m_serverConnected = true;
 
@@ -331,6 +333,14 @@ HRESULT STDMETHODCALLTYPE ServerConnection::exceptionWasRaised(
     return ret;
 }
 
+HRESULT STDMETHODCALLTYPE ServerConnection::serverDidDie()
+{
+    m_server = 0;
+    m_currentFrame = 0;
+    m_serverConnected = false;
+    return S_OK;
+}
+
 // Stack & Variables
 
 IWebScriptCallFrame* ServerConnection::currentFrame() const

diff --git a/WebKitTools/Drosera/win/ServerConnection.h b/WebKitTools/Drosera/win/ServerConnection.h
index c3ddee574837cd21951271be8de410febdeb344b..765d487023412a1659a959b52c0759149923421f 100644 (file)
--- a/WebKitTools/Drosera/win/ServerConnection.h
+++ b/WebKitTools/Drosera/win/ServerConnection.h
@@ -111,13 +111,14 @@ public:
         /* [in] */ int lineNumber,
         /* [in] */ IWebFrame*);
 
+    virtual HRESULT STDMETHODCALLTYPE serverDidDie();
+
     // Stack & Variables
     IWebScriptCallFrame* currentFrame() const;
     COMPtr<IWebScriptCallFrame> getCallerFrame(int callFrame) const;
 
 private:
     bool m_serverConnected;
-    std::wstring m_currentServerName;
 
     COMPtr<IWebScriptCallFrame> m_currentFrame;
     COMPtr<IWebScriptDebugServer> m_server;