Unreviewed, rolling out r101193.
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 26 Nov 2011 15:51:44 +0000 (15:51 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 26 Nov 2011 15:51:44 +0000 (15:51 +0000)
http://trac.webkit.org/changeset/101193
https://bugs.webkit.org/show_bug.cgi?id=73158

Breaks Windows and Qt minimal. (Requested by pfeldman on
#webkit).

Patch by Sheriff Bot <webkit.review.bot@gmail.com> on 2011-11-26

Source/WebCore:

* inspector/Inspector.json:
* inspector/InspectorAgent.cpp:
(WebCore::InspectorAgent::inspectedPageDestroyed):
* inspector/InspectorClient.h:
* inspector/InspectorController.cpp:
(WebCore::InspectorController::close):
* inspector/InspectorFrontendClient.h:
* inspector/InspectorFrontendHost.cpp:
(WebCore::InspectorFrontendHost::disconnectFromBackend):
* inspector/InspectorFrontendHost.h:
* inspector/InspectorFrontendHost.idl:
* inspector/front-end/InspectorFrontendHostStub.js:
(.WebInspector.InspectorFrontendHostStub.prototype.disconnectFromBackend):
* inspector/front-end/inspector.js:
(WebInspector.disconnectFromBackend):
* loader/EmptyClients.h:

Source/WebKit/chromium:

* src/InspectorClientImpl.cpp:
* src/InspectorClientImpl.h:
* src/InspectorFrontendClientImpl.cpp:
(WebKit::InspectorFrontendClientImpl::disconnectFromBackend):
* src/InspectorFrontendClientImpl.h:
* src/WebDevToolsAgentImpl.cpp:
(WebKit::WebDevToolsAgent::disconnectEventAsText):
* src/WebDevToolsAgentImpl.h:

Source/WebKit/efl:

* WebCoreSupport/InspectorClientEfl.cpp:
* WebCoreSupport/InspectorClientEfl.h:

Source/WebKit/gtk:

* WebCoreSupport/InspectorClientGtk.cpp:
(WebKit::InspectorClient::inspectorDestroyed):
(WebKit::InspectorFrontendClient::disconnectFromBackend):
* WebCoreSupport/InspectorClientGtk.h:

Source/WebKit/mac:

* WebCoreSupport/WebInspectorClient.h:
* WebCoreSupport/WebInspectorClient.mm:
(WebInspectorClient::inspectorDestroyed):

Source/WebKit/qt:

* WebCoreSupport/InspectorClientQt.cpp:
(WebCore::InspectorClientQt::inspectorDestroyed):
(WebCore::InspectorFrontendClientQt::disconnectFromBackend):
(WebCore::InspectorFrontendClientQt::inspectorClientDestroyed):
* WebCoreSupport/InspectorClientQt.h:

Source/WebKit/win:

* WebCoreSupport/WebInspectorClient.cpp:
(WebInspectorClient::inspectorDestroyed):
(WebInspectorFrontendClient::disconnectFromBackend):
* WebCoreSupport/WebInspectorClient.h:

Source/WebKit/wince:

* WebCoreSupport/InspectorClientWinCE.cpp:
* WebCoreSupport/InspectorClientWinCE.h:

Source/WebKit/wx:

* WebKitSupport/InspectorClientWx.cpp:
* WebKitSupport/InspectorClientWx.h:

Source/WebKit2:

* WebProcess/WebCoreSupport/WebInspectorClient.cpp:
(WebKit::WebInspectorClient::inspectorDestroyed):
* WebProcess/WebCoreSupport/WebInspectorClient.h:
* WebProcess/WebCoreSupport/WebInspectorFrontendClient.cpp:
(WebKit::WebInspectorFrontendClient::disconnectFromBackend):
* WebProcess/WebCoreSupport/WebInspectorFrontendClient.h:

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

45 files changed:
Source/WebCore/ChangeLog
Source/WebCore/inspector/Inspector.json
Source/WebCore/inspector/InspectorAgent.cpp
Source/WebCore/inspector/InspectorClient.h
Source/WebCore/inspector/InspectorController.cpp
Source/WebCore/inspector/InspectorFrontendClient.h
Source/WebCore/inspector/InspectorFrontendHost.cpp
Source/WebCore/inspector/InspectorFrontendHost.h
Source/WebCore/inspector/InspectorFrontendHost.idl
Source/WebCore/inspector/front-end/InspectorFrontendHostStub.js
Source/WebCore/inspector/front-end/inspector.js
Source/WebCore/loader/EmptyClients.h
Source/WebKit/chromium/ChangeLog
Source/WebKit/chromium/src/InspectorClientImpl.cpp
Source/WebKit/chromium/src/InspectorClientImpl.h
Source/WebKit/chromium/src/InspectorFrontendClientImpl.cpp
Source/WebKit/chromium/src/InspectorFrontendClientImpl.h
Source/WebKit/chromium/src/WebDevToolsAgentImpl.cpp
Source/WebKit/chromium/src/WebDevToolsAgentImpl.h
Source/WebKit/efl/ChangeLog
Source/WebKit/efl/WebCoreSupport/InspectorClientEfl.cpp
Source/WebKit/efl/WebCoreSupport/InspectorClientEfl.h
Source/WebKit/gtk/ChangeLog
Source/WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp
Source/WebKit/gtk/WebCoreSupport/InspectorClientGtk.h
Source/WebKit/mac/ChangeLog
Source/WebKit/mac/WebCoreSupport/WebInspectorClient.h
Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm
Source/WebKit/qt/ChangeLog
Source/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp
Source/WebKit/qt/WebCoreSupport/InspectorClientQt.h
Source/WebKit/win/ChangeLog
Source/WebKit/win/WebCoreSupport/WebInspectorClient.cpp
Source/WebKit/win/WebCoreSupport/WebInspectorClient.h
Source/WebKit/wince/ChangeLog
Source/WebKit/wince/WebCoreSupport/InspectorClientWinCE.cpp
Source/WebKit/wince/WebCoreSupport/InspectorClientWinCE.h
Source/WebKit/wx/ChangeLog
Source/WebKit/wx/WebKitSupport/InspectorClientWx.cpp
Source/WebKit/wx/WebKitSupport/InspectorClientWx.h
Source/WebKit2/ChangeLog
Source/WebKit2/WebProcess/WebCoreSupport/WebInspectorClient.cpp
Source/WebKit2/WebProcess/WebCoreSupport/WebInspectorClient.h
Source/WebKit2/WebProcess/WebCoreSupport/WebInspectorFrontendClient.cpp
Source/WebKit2/WebProcess/WebCoreSupport/WebInspectorFrontendClient.h

index f5678df..3dcf53c 100644 (file)
@@ -1,3 +1,29 @@
+2011-11-26  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r101193.
+        http://trac.webkit.org/changeset/101193
+        https://bugs.webkit.org/show_bug.cgi?id=73158
+
+        Breaks Windows and Qt minimal. (Requested by pfeldman on
+        #webkit).
+
+        * inspector/Inspector.json:
+        * inspector/InspectorAgent.cpp:
+        (WebCore::InspectorAgent::inspectedPageDestroyed):
+        * inspector/InspectorClient.h:
+        * inspector/InspectorController.cpp:
+        (WebCore::InspectorController::close):
+        * inspector/InspectorFrontendClient.h:
+        * inspector/InspectorFrontendHost.cpp:
+        (WebCore::InspectorFrontendHost::disconnectFromBackend):
+        * inspector/InspectorFrontendHost.h:
+        * inspector/InspectorFrontendHost.idl:
+        * inspector/front-end/InspectorFrontendHostStub.js:
+        (.WebInspector.InspectorFrontendHostStub.prototype.disconnectFromBackend):
+        * inspector/front-end/inspector.js:
+        (WebInspector.disconnectFromBackend):
+        * loader/EmptyClients.h:
+
 2011-11-26  Pavel Feldman  <pfeldman@google.com>
 
         Web Inspector: remove disconnectFromBackend from the protocol.
index 0ece069..09d45cf 100644 (file)
@@ -8,7 +8,7 @@
         ],
         "events": [
             {
-                "name": "disconnectFromWorker"
+                "name": "disconnectFromBackend"
             },
             {
                 "name": "evaluateForTestInFrontend",
index c40ae51..5032c17 100644 (file)
@@ -83,6 +83,8 @@ InspectorAgent::~InspectorAgent()
 
 void InspectorAgent::inspectedPageDestroyed()
 {
+    if (m_frontend)
+        m_frontend->inspector()->disconnectFromBackend();
     ASSERT(m_inspectedPage);
     m_inspectedPage = 0;
 }
index 83ab232..9fad5d6 100644 (file)
@@ -44,7 +44,6 @@ public:
     virtual void inspectorDestroyed() = 0;
 
     virtual void openInspectorFrontend(InspectorController*) = 0;
-    virtual void closeInspectorFrontend() = 0;
     virtual void bringFrontendToFront() = 0;
 
     virtual void highlight() = 0;
index 16bbaed..d211b4e 100644 (file)
@@ -271,8 +271,8 @@ void InspectorController::close()
 {
     if (!m_inspectorFrontend)
         return;
+    m_inspectorFrontend->inspector()->disconnectFromBackend();
     disconnectFrontend();
-    m_inspectorClient->closeInspectorFrontend();
 }
 
 void InspectorController::restoreInspectorStateFromCookie(const String& inspectorStateCookie)
index 78dbbaa..bc8a135 100644 (file)
@@ -53,6 +53,7 @@ public:
 
     virtual void bringToFront() = 0;
     virtual void closeWindow() = 0;
+    virtual void disconnectFromBackend() = 0;
 
     virtual void requestAttachWindow() = 0;
     virtual void requestDetachWindow() = 0;
index 0ce2db5..9f49b4d 100644 (file)
@@ -169,6 +169,14 @@ void InspectorFrontendHost::closeWindow()
     }
 }
 
+void InspectorFrontendHost::disconnectFromBackend()
+{
+    if (m_client) {
+        m_client->disconnectFromBackend();
+        disconnectClient(); // Disconnect from client.
+    }
+}
+
 void InspectorFrontendHost::bringToFront()
 {
     if (m_client)
index 1d0769a..97b558c 100644 (file)
@@ -61,6 +61,7 @@ public:
     void requestAttachWindow();
     void requestDetachWindow();
     void closeWindow();
+    void disconnectFromBackend();
     void bringToFront();
     void inspectedURLChanged(const String&);
 
index afefd46..db9436b 100644 (file)
@@ -36,6 +36,7 @@ module core {
     ] InspectorFrontendHost {
         void loaded();
         void closeWindow();
+        void disconnectFromBackend();
         void bringToFront();
         void inspectedURLChanged(in DOMString newURL);
 
index ea603e7..590e055 100644 (file)
@@ -65,6 +65,11 @@ WebInspector.InspectorFrontendHostStub.prototype = {
         this._windowVisible = false;
     },
 
+    disconnectFromBackend: function()
+    {
+        this._windowVisible = false;
+    },
+
     attach: function()
     {
     },
index 103fccc..b27e7ff 100644 (file)
@@ -466,9 +466,12 @@ WebInspector.close = function(event)
     InspectorFrontendHost.closeWindow();
 }
 
-WebInspector.disconnectFromWorker = function()
+WebInspector.disconnectFromBackend = function()
 {
-    WebInspector.WorkerManager.showWorkerTerminatedScreen();
+    if (WebInspector.WorkerManager.isWorkerFrontend())
+        WebInspector.WorkerManager.showWorkerTerminatedScreen();
+    else
+        InspectorFrontendHost.disconnectFromBackend();
 }
 
 WebInspector.documentClick = function(event)
index 3f8a8a6..40045a3 100644 (file)
@@ -590,7 +590,6 @@ public:
     virtual void inspectorDestroyed() { }
     
     virtual void openInspectorFrontend(InspectorController*) { }
-    virtual void closeInspectorFrontend() { }
     virtual void bringFrontendToFront() { }
 
     virtual void highlight() { }
index 9d164f3..3920de8 100644 (file)
@@ -1,3 +1,21 @@
+2011-11-26  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r101193.
+        http://trac.webkit.org/changeset/101193
+        https://bugs.webkit.org/show_bug.cgi?id=73158
+
+        Breaks Windows and Qt minimal. (Requested by pfeldman on
+        #webkit).
+
+        * src/InspectorClientImpl.cpp:
+        * src/InspectorClientImpl.h:
+        * src/InspectorFrontendClientImpl.cpp:
+        (WebKit::InspectorFrontendClientImpl::disconnectFromBackend):
+        * src/InspectorFrontendClientImpl.h:
+        * src/WebDevToolsAgentImpl.cpp:
+        (WebKit::WebDevToolsAgent::disconnectEventAsText):
+        * src/WebDevToolsAgentImpl.h:
+
 2011-11-26  Pavel Feldman  <pfeldman@google.com>
 
         Web Inspector: remove disconnectFromBackend from the protocol.
index 9f5aad1..c9af7b8 100644 (file)
@@ -69,12 +69,6 @@ void InspectorClientImpl::openInspectorFrontend(InspectorController* controller)
         agent->openInspectorFrontend(controller);
 }
 
-void InspectorClientImpl::closeInspectorFrontend()
-{
-    if (WebDevToolsAgentImpl* agent = devToolsAgent())
-        agent->closeInspectorFrontend();
-}
-
 void InspectorClientImpl::bringFrontendToFront()
 {
     if (WebDevToolsAgentImpl* agent = devToolsAgent())
index 0e900b5..743bde6 100644 (file)
@@ -49,7 +49,6 @@ public:
     // InspectorClient methods:
     virtual void inspectorDestroyed();
     virtual void openInspectorFrontend(WebCore::InspectorController*);
-    virtual void closeInspectorFrontend();
     virtual void bringFrontendToFront();
 
     virtual void highlight();
index a62ac49..114036e 100644 (file)
@@ -105,6 +105,11 @@ void InspectorFrontendClientImpl::closeWindow()
     m_client->closeWindow();
 }
 
+void InspectorFrontendClientImpl::disconnectFromBackend()
+{
+    m_client->closeWindow();
+}
+
 void InspectorFrontendClientImpl::requestAttachWindow()
 {
     m_client->requestDockWindow();
index f16535c..fd45f5b 100644 (file)
@@ -61,6 +61,7 @@ public:
 
     virtual void bringToFront();
     virtual void closeWindow();
+    virtual void disconnectFromBackend();
 
     virtual void requestAttachWindow();
     virtual void requestDetachWindow();
index cd6b09c..704a77f 100644 (file)
@@ -268,10 +268,6 @@ void WebDevToolsAgentImpl::openInspectorFrontend(InspectorController*)
 {
 }
 
-void WebDevToolsAgentImpl::closeInspectorFrontend()
-{
-}
-
 void WebDevToolsAgentImpl::bringFrontendToFront()
 {
 }
@@ -389,7 +385,7 @@ WebString WebDevToolsAgent::disconnectEventAsText()
         String m_message;
     } channel;
     InspectorFrontend::Inspector inspector(&channel);
-    inspector.disconnectFromWorker();
+    inspector.disconnectFromBackend();
     return channel.m_message;
 }
 
index 91a8891..63f79ab 100644 (file)
@@ -85,8 +85,6 @@ public:
     // InspectorClient implementation.
     virtual void inspectorDestroyed();
     virtual void openInspectorFrontend(WebCore::InspectorController*);
-    virtual void closeInspectorFrontend();
-
     virtual void bringFrontendToFront();
     virtual void highlight();
     virtual void hideHighlight();
index f6d1f73..d59fbdc 100755 (executable)
@@ -1,3 +1,15 @@
+2011-11-26  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r101193.
+        http://trac.webkit.org/changeset/101193
+        https://bugs.webkit.org/show_bug.cgi?id=73158
+
+        Breaks Windows and Qt minimal. (Requested by pfeldman on
+        #webkit).
+
+        * WebCoreSupport/InspectorClientEfl.cpp:
+        * WebCoreSupport/InspectorClientEfl.h:
+
 2011-11-24  KwangHyuk Kim  <hyuki.kim@samsung.com>
 
         [EFL] Add implementation considering ewk_tiled_backing_store's visible status.
index 7e29758..15147d6 100644 (file)
@@ -38,11 +38,6 @@ void InspectorClientEfl::openInspectorFrontend(InspectorController*)
     notImplemented();
 }
 
-void InspectorClientEfl::closeInspectorFrontend()
-{
-    notImplemented();
-}
-
 void InspectorClientEfl::bringFrontendToFront()
 {
     notImplemented();
index f92e94d..e91d943 100644 (file)
@@ -43,7 +43,6 @@ public:
     virtual void inspectorDestroyed();
 
     virtual void openInspectorFrontend(InspectorController*);
-    virtual void closeInspectorFrontend();
     virtual void bringFrontendToFront();
 
     virtual void highlight();
index 64a2048..ce08fd4 100644 (file)
@@ -1,3 +1,17 @@
+2011-11-26  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r101193.
+        http://trac.webkit.org/changeset/101193
+        https://bugs.webkit.org/show_bug.cgi?id=73158
+
+        Breaks Windows and Qt minimal. (Requested by pfeldman on
+        #webkit).
+
+        * WebCoreSupport/InspectorClientGtk.cpp:
+        (WebKit::InspectorClient::inspectorDestroyed):
+        (WebKit::InspectorFrontendClient::disconnectFromBackend):
+        * WebCoreSupport/InspectorClientGtk.h:
+
 2011-11-26  Pavel Feldman  <pfeldman@google.com>
 
         Web Inspector: remove disconnectFromBackend from the protocol.
index 2e55ca3..e15b904 100644 (file)
@@ -117,7 +117,6 @@ InspectorClient::~InspectorClient()
 
 void InspectorClient::inspectorDestroyed()
 {
-    closeInspectorFrontend();
     delete this;
 }
 
@@ -157,12 +156,6 @@ void InspectorClient::openInspectorFrontend(InspectorController* controller)
     m_frontendPage->setGroupName("");
 }
 
-void InspectorClient::closeInspectorFrontend()
-{
-    if (m_frontendClient)
-        m_frontendClient->destroyInspectorWindow(false);
-}
-
 void InspectorClient::bringFrontendToFront()
 {
     m_frontendClient->bringToFront();
@@ -282,6 +275,11 @@ void InspectorFrontendClient::closeWindow()
     destroyInspectorWindow(true);
 }
 
+void InspectorFrontendClient::disconnectFromBackend()
+{
+    destroyInspectorWindow(false);
+}
+
 void InspectorFrontendClient::attachWindow()
 {
     if (!m_inspectorWebView)
index c692e8f..158b01f 100644 (file)
@@ -54,7 +54,6 @@ namespace WebKit {
         virtual void inspectorDestroyed();
 
         virtual void openInspectorFrontend(WebCore::InspectorController*);
-        virtual void closeInspectorFrontend();
         virtual void bringFrontendToFront();
 
         virtual void highlight();
@@ -87,6 +86,7 @@ namespace WebKit {
 
         virtual void bringToFront();
         virtual void closeWindow();
+        virtual void disconnectFromBackend();
 
         virtual void attachWindow();
         virtual void detachWindow();
index 878053e..e0d07c7 100644 (file)
@@ -1,3 +1,16 @@
+2011-11-26  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r101193.
+        http://trac.webkit.org/changeset/101193
+        https://bugs.webkit.org/show_bug.cgi?id=73158
+
+        Breaks Windows and Qt minimal. (Requested by pfeldman on
+        #webkit).
+
+        * WebCoreSupport/WebInspectorClient.h:
+        * WebCoreSupport/WebInspectorClient.mm:
+        (WebInspectorClient::inspectorDestroyed):
+
 2011-11-26  Pavel Feldman  <pfeldman@google.com>
 
         Web Inspector: remove disconnectFromBackend from the protocol.
index 52880bd..6fde886 100644 (file)
@@ -51,8 +51,6 @@ class Page;
 
 }
 
-class WebInspectorFrontendClient;
-
 class WebInspectorClient : public WebCore::InspectorClient {
 public:
     WebInspectorClient(WebView *);
@@ -60,7 +58,6 @@ public:
     virtual void inspectorDestroyed() OVERRIDE;
 
     virtual void openInspectorFrontend(WebCore::InspectorController*) OVERRIDE;
-    virtual void closeInspectorFrontend() OVERRIDE;
     virtual void bringFrontendToFront() OVERRIDE;
 
     virtual void highlight() OVERRIDE;
@@ -79,7 +76,7 @@ private:
     WebView *m_webView;
     RetainPtr<WebNodeHighlighter> m_highlighter;
     WebCore::Page* m_frontendPage;
-    WebInspectorFrontendClient* m_frontendClient;
+    WebCore::InspectorFrontendClient* m_frontendClient;
 };
 
 
index ce881a5..ab87c11 100644 (file)
@@ -83,7 +83,6 @@ WebInspectorClient::WebInspectorClient(WebView *webView)
 
 void WebInspectorClient::inspectorDestroyed()
 {
-    closeInspectorFrontend();
     delete this;
 }
 
@@ -100,12 +99,6 @@ void WebInspectorClient::openInspectorFrontend(InspectorController* inspectorCon
     m_frontendPage->inspectorController()->setInspectorFrontendClient(frontendClient.release());
 }
 
-void WebInspectorClient::closeInspectorFrontend()
-{
-    if (m_frontendClient)
-        m_frontendClient->disconnectFromBackend();
-}
-
 void WebInspectorClient::bringFrontendToFront()
 {
     m_frontendClient->bringToFront();
index aebc6d8..adb1c68 100644 (file)
@@ -1,3 +1,18 @@
+2011-11-26  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r101193.
+        http://trac.webkit.org/changeset/101193
+        https://bugs.webkit.org/show_bug.cgi?id=73158
+
+        Breaks Windows and Qt minimal. (Requested by pfeldman on
+        #webkit).
+
+        * WebCoreSupport/InspectorClientQt.cpp:
+        (WebCore::InspectorClientQt::inspectorDestroyed):
+        (WebCore::InspectorFrontendClientQt::disconnectFromBackend):
+        (WebCore::InspectorFrontendClientQt::inspectorClientDestroyed):
+        * WebCoreSupport/InspectorClientQt.h:
+
 2011-11-26  Pavel Feldman  <pfeldman@google.com>
 
         Web Inspector: remove disconnectFromBackend from the protocol.
index fdb6da3..36b47d5 100644 (file)
@@ -189,7 +189,8 @@ InspectorClientQt::InspectorClientQt(QWebPage* page)
 void InspectorClientQt::inspectorDestroyed()
 {
 #if ENABLE(INSPECTOR)
-    closeInspectorFrontend();
+    if (m_frontendClient)
+        m_frontendClient->inspectorClientDestroyed();
 
     InspectorServerQt* webInspectorServer = InspectorServerQt::server();
     if (webInspectorServer)
@@ -242,12 +243,6 @@ void InspectorClientQt::openInspectorFrontend(WebCore::InspectorController* insp
 #endif
 }
 
-void InspectorClientQt::closeInspectorFrontend()
-{
-    if (m_frontendClient)
-        m_frontendClient->inspectorClientDestroyed();
-}
-
 void InspectorClientQt::bringFrontendToFront()
 {
     m_frontendClient->bringToFront();
@@ -353,6 +348,11 @@ void InspectorFrontendClientQt::closeWindow()
     destroyInspectorView(true);
 }
 
+void InspectorFrontendClientQt::disconnectFromBackend()
+{
+    destroyInspectorView(false);
+}
+
 void InspectorFrontendClientQt::attachWindow()
 {
     notImplemented();
@@ -407,7 +407,6 @@ void InspectorFrontendClientQt::destroyInspectorView(bool notifyInspectorControl
 
 void InspectorFrontendClientQt::inspectorClientDestroyed()
 {
-    destroyInspectorView(false);
     m_inspectorClient = 0;
     m_inspectedWebPage = 0;
 }
index c94d61a..c649c6b 100644 (file)
@@ -52,7 +52,6 @@ public:
     virtual void inspectorDestroyed();
 
     virtual void openInspectorFrontend(WebCore::InspectorController*);
-    virtual void closeInspectorFrontend();
     virtual void bringFrontendToFront();
 
     virtual void highlight();
@@ -88,6 +87,7 @@ public:
 
     virtual void bringToFront();
     virtual void closeWindow();
+    virtual void disconnectFromBackend();
 
     virtual void attachWindow();
     virtual void detachWindow();
index 2692df3..6677daf 100644 (file)
@@ -1,3 +1,17 @@
+2011-11-26  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r101193.
+        http://trac.webkit.org/changeset/101193
+        https://bugs.webkit.org/show_bug.cgi?id=73158
+
+        Breaks Windows and Qt minimal. (Requested by pfeldman on
+        #webkit).
+
+        * WebCoreSupport/WebInspectorClient.cpp:
+        (WebInspectorClient::inspectorDestroyed):
+        (WebInspectorFrontendClient::disconnectFromBackend):
+        * WebCoreSupport/WebInspectorClient.h:
+
 2011-11-26  Pavel Feldman  <pfeldman@google.com>
 
         Web Inspector: remove disconnectFromBackend from the protocol.
index f1eaaec..f5e2f38 100644 (file)
@@ -82,7 +82,6 @@ WebInspectorClient::~WebInspectorClient()
 
 void WebInspectorClient::inspectorDestroyed()
 {
-    closeInspectorFrontend();
     delete this;
 }
 
@@ -179,12 +178,6 @@ void WebInspectorClient::openInspectorFrontend(InspectorController* inspectorCon
     m_frontendHwnd = frontendHwnd;
 }
 
-void WebInspectorClient::closeInspectorFrontend()
-{
-    if (m_frontendClient)
-        m_frontendClient->destroyInspectorView(false);
-}
-
 void WebInspectorClient::bringFrontendToFront()
 {
     m_frontendClient->bringToFront();
@@ -278,6 +271,11 @@ void WebInspectorFrontendClient::closeWindow()
     destroyInspectorView(true);
 }
 
+void WebInspectorFrontendClient::disconnectFromBackend()
+{
+    destroyInspectorView(false);
+}
+
 void WebInspectorFrontendClient::attachWindow()
 {
     if (m_attached)
index a43fbeb..0b9c1a4 100644 (file)
@@ -58,7 +58,6 @@ public:
     virtual void inspectorDestroyed();
 
     virtual void openInspectorFrontend(WebCore::InspectorController*);
-    virtual void closeInspectorFrontend();
     virtual void bringFrontendToFront();
 
     virtual void highlight();
@@ -114,12 +113,12 @@ public:
     virtual void setAttachedWindowHeight(unsigned height);
     virtual void inspectedURLChanged(const WTF::String& newURL);
 
-    void destroyInspectorView(bool notifyInspectorController);
-
 private:
     void closeWindowWithoutNotifications();
     void showWindowWithoutNotifications();
 
+    void destroyInspectorView(bool notifyInspectorController);
+
     void updateWindowTitle();
 
     LRESULT onGetMinMaxInfo(WPARAM, LPARAM);
index 3610f22..11ac674 100644 (file)
@@ -1,3 +1,15 @@
+2011-11-26  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r101193.
+        http://trac.webkit.org/changeset/101193
+        https://bugs.webkit.org/show_bug.cgi?id=73158
+
+        Breaks Windows and Qt minimal. (Requested by pfeldman on
+        #webkit).
+
+        * WebCoreSupport/InspectorClientWinCE.cpp:
+        * WebCoreSupport/InspectorClientWinCE.h:
+
 2011-11-22  Pavel Feldman  <pfeldman@google.com>
 
         Web Inspector: remove Inspector::bringToFront from the protocol.
index 5bb34ef..dc7acc7 100644 (file)
@@ -50,11 +50,6 @@ void InspectorClientWinCE::openInspectorFrontend(InspectorController* controller
     notImplemented();
 }
 
-void InspectorClientWinCE::closeInspectorFrontend()
-{
-    notImplemented();
-}
-
 void InspectorClientWinCE::bringFrontendToFront()
 {
     notImplemented();
index dfd8230..a6080ae 100644 (file)
@@ -39,7 +39,6 @@ public:
     virtual void inspectorDestroyed();
 
     virtual void openInspectorFrontend(WebCore::InspectorController*);
-    virtual void closeInspectorFrontend();
     virtual void bringFrontendToFront();
 
     virtual void highlight();
index dce887e..1875aed 100644 (file)
@@ -1,3 +1,15 @@
+2011-11-26  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r101193.
+        http://trac.webkit.org/changeset/101193
+        https://bugs.webkit.org/show_bug.cgi?id=73158
+
+        Breaks Windows and Qt minimal. (Requested by pfeldman on
+        #webkit).
+
+        * WebKitSupport/InspectorClientWx.cpp:
+        * WebKitSupport/InspectorClientWx.h:
+
 2011-11-22  Pavel Feldman  <pfeldman@google.com>
 
         Web Inspector: remove Inspector::bringToFront from the protocol.
index 8a4e792..e3c4dbc 100644 (file)
@@ -52,11 +52,6 @@ void InspectorClientWx::openInspectorFrontend(WebCore::InspectorController*)
     notImplemented();
 }
 
-void InspectorClientWx::closeInspectorFrontend()
-{
-    notImplemented();
-}
-
 void InspectorClientWx::bringFrontendToFront()
 {
     notImplemented();
index e10e67b..029c216 100644 (file)
@@ -41,7 +41,6 @@ public:
     virtual void inspectorDestroyed();
 
     virtual void openInspectorFrontend(WebCore::InspectorController*);
-    virtual void closeInspectorFrontend();
     virtual void bringFrontendToFront();
 
     virtual void highlight();
index 9e45a06..96e363f 100644 (file)
@@ -1,3 +1,19 @@
+2011-11-26  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r101193.
+        http://trac.webkit.org/changeset/101193
+        https://bugs.webkit.org/show_bug.cgi?id=73158
+
+        Breaks Windows and Qt minimal. (Requested by pfeldman on
+        #webkit).
+
+        * WebProcess/WebCoreSupport/WebInspectorClient.cpp:
+        (WebKit::WebInspectorClient::inspectorDestroyed):
+        * WebProcess/WebCoreSupport/WebInspectorClient.h:
+        * WebProcess/WebCoreSupport/WebInspectorFrontendClient.cpp:
+        (WebKit::WebInspectorFrontendClient::disconnectFromBackend):
+        * WebProcess/WebCoreSupport/WebInspectorFrontendClient.h:
+
 2011-11-26  Pavel Feldman  <pfeldman@google.com>
 
         Web Inspector: remove disconnectFromBackend from the protocol.
index 54b477e..491ee57 100644 (file)
@@ -39,7 +39,6 @@ namespace WebKit {
 
 void WebInspectorClient::inspectorDestroyed()
 {
-    closeInspectorFrontend();
     delete this;
 }
 
@@ -49,11 +48,6 @@ void WebInspectorClient::openInspectorFrontend(InspectorController*)
     ASSERT_UNUSED(inspectorPage, inspectorPage);
 }
 
-void WebInspectorClient::closeInspectorFrontend()
-{
-    m_page->inspector()->didClose();
-}
-
 void WebInspectorClient::bringFrontendToFront()
 {
     m_page->inspector()->bringToFront();
index 3970030..849ad22 100644 (file)
@@ -53,7 +53,6 @@ private:
     virtual void inspectorDestroyed() OVERRIDE;
 
     virtual void openInspectorFrontend(WebCore::InspectorController*) OVERRIDE;
-    virtual void closeInspectorFrontend() OVERRIDE;
     virtual void bringFrontendToFront() OVERRIDE;
 
     virtual void highlight() OVERRIDE;
index 09e1d37..8a98195 100644 (file)
@@ -74,6 +74,11 @@ void WebInspectorFrontendClient::closeWindow()
     m_page->inspector()->didClose();
 }
 
+void WebInspectorFrontendClient::disconnectFromBackend()
+{
+    m_page->inspector()->didClose();
+}
+
 void WebInspectorFrontendClient::attachWindow()
 {
     m_page->inspector()->attach();
index 3183ab0..d8b17bd 100644 (file)
@@ -46,6 +46,7 @@ private:
 
     virtual void bringToFront() OVERRIDE;
     virtual void closeWindow() OVERRIDE;
+    virtual void disconnectFromBackend() OVERRIDE;
 
     virtual void attachWindow() OVERRIDE;
     virtual void detachWindow() OVERRIDE;