[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

yurys at chromium.org yurys at chromium.org
Wed Dec 22 12:38:45 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 1d80b8907eb444ea75ff26caf7cd287a777bf0c7
Author: yurys at chromium.org <yurys at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Aug 26 15:58:22 2010 +0000

    2010-08-26  Yury Semikhatsky  <yurys at chromium.org>
    
            Unreviewed. Revert r66103 since Qt tests are failing.
    
            * inspector/Inspector.idl:
            * inspector/InspectorController.cpp:
            (WebCore::InspectorController::inspectedPageDestroyed):
            (WebCore::InspectorController::close):
            * inspector/InspectorFrontendClient.h:
            * inspector/InspectorFrontendHost.cpp:
            * inspector/InspectorFrontendHost.h:
            * inspector/InspectorFrontendHost.idl:
            * inspector/front-end/InspectorFrontendHostStub.js:
            * inspector/front-end/inspector.js:
            (WebInspector.inspectedPageDestroyed):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66106 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 02ec189..268cd7b 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,21 @@
 2010-08-26  Yury Semikhatsky  <yurys at chromium.org>
 
+        Unreviewed. Revert r66103 since Qt tests are failing.
+
+        * inspector/Inspector.idl:
+        * inspector/InspectorController.cpp:
+        (WebCore::InspectorController::inspectedPageDestroyed):
+        (WebCore::InspectorController::close):
+        * inspector/InspectorFrontendClient.h:
+        * inspector/InspectorFrontendHost.cpp:
+        * inspector/InspectorFrontendHost.h:
+        * inspector/InspectorFrontendHost.idl:
+        * inspector/front-end/InspectorFrontendHostStub.js:
+        * inspector/front-end/inspector.js:
+        (WebInspector.inspectedPageDestroyed):
+
+2010-08-26  Yury Semikhatsky  <yurys at chromium.org>
+
         Reviewed by Pavel Feldman.
 
         REGRESSION: Crash occurs at objc_msgSend when closing a window that is displaying the web inspector
diff --git a/WebCore/inspector/Inspector.idl b/WebCore/inspector/Inspector.idl
index e9b69f8..7f39f8d 100644
--- a/WebCore/inspector/Inspector.idl
+++ b/WebCore/inspector/Inspector.idl
@@ -40,9 +40,10 @@ module core {
         [notify] void childNodeCountUpdated(out long id, out int newValue);
         [notify] void childNodeInserted(out long parentId, out long prevId, out Object node);
         [notify] void childNodeRemoved(out long parentId, out long id);
+        [notify] void close();
         [notify] void didCommitLoad();
         [notify] void evaluateForTestInFrontend(out long testCallId, out String script);
-        [notify] void disconnectFromBackend();
+        [notify] void inspectedPageDestroyed();
         [notify] void inspectedURLChanged(out String url);
         [notify] void monitoringXHRWasEnabled();
         [notify] void monitoringXHRWasDisabled();
diff --git a/WebCore/inspector/InspectorController.cpp b/WebCore/inspector/InspectorController.cpp
index b9c11c7..7fb052c 100644
--- a/WebCore/inspector/InspectorController.cpp
+++ b/WebCore/inspector/InspectorController.cpp
@@ -198,7 +198,7 @@ InspectorController::~InspectorController()
 void InspectorController::inspectedPageDestroyed()
 {
     if (m_frontend)
-        m_frontend->disconnectFromBackend();
+        m_frontend->inspectedPageDestroyed();
 
     hideHighlight();
 
@@ -537,8 +537,7 @@ void InspectorController::close()
 {
     if (!m_frontend)
         return;
-    m_frontend->disconnectFromBackend();
-    disconnectFrontend();
+    m_frontend->close();
 }
 
 void InspectorController::disconnectFrontend()
diff --git a/WebCore/inspector/InspectorFrontendClient.h b/WebCore/inspector/InspectorFrontendClient.h
index 31f52b7..cbbbc53 100644
--- a/WebCore/inspector/InspectorFrontendClient.h
+++ b/WebCore/inspector/InspectorFrontendClient.h
@@ -53,7 +53,6 @@ public:
 
     virtual void bringToFront() = 0;
     virtual void closeWindow() = 0;
-    virtual void disconnectFromBackend() = 0;
 
     virtual void requestAttachWindow() = 0;
     virtual void requestDetachWindow() = 0;
diff --git a/WebCore/inspector/InspectorFrontendHost.cpp b/WebCore/inspector/InspectorFrontendHost.cpp
index bc529ea..8dc00ae 100644
--- a/WebCore/inspector/InspectorFrontendHost.cpp
+++ b/WebCore/inspector/InspectorFrontendHost.cpp
@@ -166,14 +166,6 @@ void InspectorFrontendHost::closeWindow()
     }
 }
 
-void InspectorFrontendHost::disconnectFromBackend()
-{
-    if (m_client) {
-        m_client->disconnectFromBackend();
-        disconnectClient(); // Disconnect from client.
-    }
-}
-
 void InspectorFrontendHost::bringToFront()
 {
     if (m_client)
diff --git a/WebCore/inspector/InspectorFrontendHost.h b/WebCore/inspector/InspectorFrontendHost.h
index d333893..4b343fd 100644
--- a/WebCore/inspector/InspectorFrontendHost.h
+++ b/WebCore/inspector/InspectorFrontendHost.h
@@ -62,7 +62,6 @@ public:
     void requestAttachWindow();
     void requestDetachWindow();
     void closeWindow();
-    void disconnectFromBackend();
     void bringToFront();
     void inspectedURLChanged(const String&);
 
diff --git a/WebCore/inspector/InspectorFrontendHost.idl b/WebCore/inspector/InspectorFrontendHost.idl
index 6853c7d..0c7cf8b 100644
--- a/WebCore/inspector/InspectorFrontendHost.idl
+++ b/WebCore/inspector/InspectorFrontendHost.idl
@@ -34,7 +34,6 @@ module core {
     interface [Conditional=INSPECTOR] InspectorFrontendHost {
         void loaded();
         void closeWindow();
-        void disconnectFromBackend();
         void bringToFront();
         void inspectedURLChanged(in DOMString newURL);
 
diff --git a/WebCore/inspector/front-end/InspectorFrontendHostStub.js b/WebCore/inspector/front-end/InspectorFrontendHostStub.js
index 07f392d..c4e6bf4 100644
--- a/WebCore/inspector/front-end/InspectorFrontendHostStub.js
+++ b/WebCore/inspector/front-end/InspectorFrontendHostStub.js
@@ -64,11 +64,6 @@ WebInspector.InspectorFrontendHostStub.prototype = {
         this._windowVisible = false;
     },
 
-    disconnectFromBackend: function()
-    {
-        this._windowVisible = false;
-    },
-
     attach: function()
     {
     },
diff --git a/WebCore/inspector/front-end/inspector.js b/WebCore/inspector/front-end/inspector.js
index d1bdb30..2e2c54f 100644
--- a/WebCore/inspector/front-end/inspector.js
+++ b/WebCore/inspector/front-end/inspector.js
@@ -713,9 +713,9 @@ WebInspector.close = function(event)
     InspectorFrontendHost.closeWindow();
 }
 
-WebInspector.disconnectFromBackend = function()
+WebInspector.inspectedPageDestroyed = function()
 {
-    InspectorFrontendHost.disconnectFromBackend();
+    WebInspector.close();
 }
 
 WebInspector.documentMouseOver = function(event)
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index a8beac2..806bc09 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,5 +1,12 @@
 2010-08-26  Yury Semikhatsky  <yurys at chromium.org>
 
+        Unreviewed. Revert r66103 since Qt tests are failing.
+
+        * src/InspectorFrontendClientImpl.cpp:
+        * src/InspectorFrontendClientImpl.h:
+
+2010-08-26  Yury Semikhatsky  <yurys at chromium.org>
+
         Reviewed by Pavel Feldman.
 
         REGRESSION: Crash occurs at objc_msgSend when closing a window that is displaying the web inspector
diff --git a/WebKit/chromium/src/InspectorFrontendClientImpl.cpp b/WebKit/chromium/src/InspectorFrontendClientImpl.cpp
index 51864f1..46f2cb6 100644
--- a/WebKit/chromium/src/InspectorFrontendClientImpl.cpp
+++ b/WebKit/chromium/src/InspectorFrontendClientImpl.cpp
@@ -105,11 +105,6 @@ void InspectorFrontendClientImpl::closeWindow()
     m_client->closeWindow();
 }
 
-void InspectorFrontendClientImpl::disconnectFromBackend()
-{
-    m_client->closeWindow();
-}
-
 void InspectorFrontendClientImpl::requestAttachWindow()
 {
     m_client->requestDockWindow();
diff --git a/WebKit/chromium/src/InspectorFrontendClientImpl.h b/WebKit/chromium/src/InspectorFrontendClientImpl.h
index fc21f3e..1507bf2 100644
--- a/WebKit/chromium/src/InspectorFrontendClientImpl.h
+++ b/WebKit/chromium/src/InspectorFrontendClientImpl.h
@@ -61,7 +61,6 @@ public:
 
     virtual void bringToFront();
     virtual void closeWindow();
-    virtual void disconnectFromBackend();
 
     virtual void requestAttachWindow();
     virtual void requestDetachWindow();
diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index eb98cb2..18405fe 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,5 +1,15 @@
 2010-08-26  Yury Semikhatsky  <yurys at chromium.org>
 
+        Unreviewed. Revert r66103 since Qt tests are failing.
+
+        * WebCoreSupport/InspectorClientGtk.cpp:
+        (WebKit::notifyWebViewDestroyed):
+        (WebKit::InspectorFrontendClient::destroyInspectorWindow):
+        (WebKit::InspectorFrontendClient::closeWindow):
+        * WebCoreSupport/InspectorClientGtk.h:
+
+2010-08-26  Yury Semikhatsky  <yurys at chromium.org>
+
         Reviewed by Pavel Feldman.
 
         REGRESSION: Crash occurs at objc_msgSend when closing a window that is displaying the web inspector
diff --git a/WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp b/WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp
index c8b42d7..aedf21f 100644
--- a/WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp
+++ b/WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp
@@ -36,7 +36,7 @@ namespace WebKit {
 
 static void notifyWebViewDestroyed(WebKitWebView* webView, InspectorFrontendClient* inspectorFrontendClient)
 {
-    inspectorFrontendClient->destroyInspectorWindow(true);
+    inspectorFrontendClient->destroyInspectorWindow();
 }
 
 InspectorClient::InspectorClient(WebKitWebView* webView)
@@ -274,7 +274,7 @@ InspectorFrontendClient::~InspectorFrontendClient()
     ASSERT(!m_webInspector);
 }
 
-void InspectorFrontendClient::destroyInspectorWindow(bool notifyInspectorController)
+void InspectorFrontendClient::destroyInspectorWindow()
 {
     if (!m_webInspector)
         return;
@@ -284,8 +284,7 @@ void InspectorFrontendClient::destroyInspectorWindow(bool notifyInspectorControl
     g_signal_handlers_disconnect_by_func(m_inspectorWebView, (gpointer)notifyWebViewDestroyed, (gpointer)this);
     m_inspectorWebView = 0;
 
-    if (notifyInspectorController)
-        core(m_inspectedWebView)->inspectorController()->disconnectFrontend();
+    core(m_inspectedWebView)->inspectorController()->disconnectFrontend();
 
     if (m_inspectorClient)
         m_inspectorClient->releaseFrontendPage();
@@ -327,12 +326,7 @@ void InspectorFrontendClient::bringToFront()
 
 void InspectorFrontendClient::closeWindow()
 {
-    destroyInspectorWindow(true);
-}
-
-void InspectorFrontendClient::disconnectFromBackend()
-{
-    destroyInspectorWindow(false);
+    destroyInspectorWindow();
 }
 
 void InspectorFrontendClient::attachWindow()
diff --git a/WebKit/gtk/WebCoreSupport/InspectorClientGtk.h b/WebKit/gtk/WebCoreSupport/InspectorClientGtk.h
index 08038f6..8b68405 100644
--- a/WebKit/gtk/WebCoreSupport/InspectorClientGtk.h
+++ b/WebKit/gtk/WebCoreSupport/InspectorClientGtk.h
@@ -80,7 +80,7 @@ namespace WebKit {
 
         void disconnectInspectorClient() { m_inspectorClient = 0; }
 
-        void destroyInspectorWindow(bool notifyInspectorController);
+        void destroyInspectorWindow();
 
         virtual WTF::String localizedStringsURL();
 
@@ -88,7 +88,6 @@ namespace WebKit {
 
         virtual void bringToFront();
         virtual void closeWindow();
-        virtual void disconnectFromBackend();
 
         virtual void attachWindow();
         virtual void detachWindow();
diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index d9be48c..179ba10 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,5 +1,15 @@
 2010-08-26  Yury Semikhatsky  <yurys at chromium.org>
 
+        Unreviewed. Revert r66103 since Qt tests are failing.
+
+        * WebCoreSupport/WebInspectorClient.h:
+        * WebCoreSupport/WebInspectorClient.mm:
+        (WebInspectorFrontendClient::closeWindow):
+        (-[WebInspectorWindowController windowShouldClose:]):
+        (-[WebInspectorWindowController destroyInspectorView]):
+
+2010-08-26  Yury Semikhatsky  <yurys at chromium.org>
+
         Reviewed by Pavel Feldman.
 
         REGRESSION: Crash occurs at objc_msgSend when closing a window that is displaying the web inspector
diff --git a/WebKit/mac/WebCoreSupport/WebInspectorClient.h b/WebKit/mac/WebCoreSupport/WebInspectorClient.h
index 75a3cc6..d33e3b9 100644
--- a/WebKit/mac/WebCoreSupport/WebInspectorClient.h
+++ b/WebKit/mac/WebCoreSupport/WebInspectorClient.h
@@ -84,7 +84,6 @@ public:
 
     virtual void bringToFront();
     virtual void closeWindow();
-    virtual void disconnectFromBackend();
 
     virtual void attachWindow();
     virtual void detachWindow();
diff --git a/WebKit/mac/WebCoreSupport/WebInspectorClient.mm b/WebKit/mac/WebCoreSupport/WebInspectorClient.mm
index d4d0213..7cae8fc 100644
--- a/WebKit/mac/WebCoreSupport/WebInspectorClient.mm
+++ b/WebKit/mac/WebCoreSupport/WebInspectorClient.mm
@@ -66,7 +66,7 @@ using namespace WebCore;
 - (void)setFrontendClient:(WebInspectorFrontendClient*)frontendClient;
 - (void)setInspectorClient:(WebInspectorClient*)inspectorClient;
 - (void)setAttachedWindowHeight:(unsigned)height;
-- (void)destroyInspectorView:(bool)notifyInspectorController;
+- (void)destroyInspectorView;
 @end
 
 #pragma mark -
@@ -169,12 +169,7 @@ void WebInspectorFrontendClient::bringToFront()
 
 void WebInspectorFrontendClient::closeWindow()
 {
-    [m_windowController.get() destroyInspectorView:true];
-}
-
-void WebInspectorFrontendClient::disconnectFromBackend()
-{
-    [m_windowController.get() destroyInspectorView:false];
+    [m_windowController.get() destroyInspectorView];
 }
 
 void WebInspectorFrontendClient::attachWindow()
@@ -313,7 +308,7 @@ void WebInspectorFrontendClient::updateWindowTitle() const
 
 - (BOOL)windowShouldClose:(id)sender
 {
-    [self destroyInspectorView:true];
+    [self destroyInspectorView];
 
     return YES;
 }
@@ -444,7 +439,7 @@ void WebInspectorFrontendClient::updateWindowTitle() const
     [frameView setFrame:frameViewRect];
 }
 
-- (void)destroyInspectorView:(bool)notifyInspectorController
+- (void)destroyInspectorView
 {
     if (_destroyingInspectorView)
         return;
@@ -455,12 +450,10 @@ void WebInspectorFrontendClient::updateWindowTitle() const
 
     _visible = NO;
 
-    if (notifyInspectorController) {
-        if (Page* inspectedPage = [_inspectedWebView page])
-            inspectedPage->inspectorController()->disconnectFrontend();
+    if (Page* inspectedPage = [_inspectedWebView page])
+        inspectedPage->inspectorController()->disconnectFrontend();
 
-        _inspectorClient->releaseFrontendPage();
-    }
+    _inspectorClient->releaseFrontendPage();
 
     [_webView close];
 }
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index f2cd3b8..308ce3f 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,5 +1,13 @@
 2010-08-26  Yury Semikhatsky  <yurys at chromium.org>
 
+        Unreviewed. Revert r66103 since Qt tests are failing.
+
+        * WebCoreSupport/InspectorClientQt.cpp:
+        (WebCore::InspectorFrontendClientQt::closeWindow):
+        * WebCoreSupport/InspectorClientQt.h:
+
+2010-08-26  Yury Semikhatsky  <yurys at chromium.org>
+
         Reviewed by Pavel Feldman.
 
         REGRESSION: Crash occurs at objc_msgSend when closing a window that is displaying the web inspector
diff --git a/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp b/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp
index 6215523..e13f6c3 100644
--- a/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp
+++ b/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp
@@ -275,12 +275,19 @@ void InspectorFrontendClientQt::bringToFront()
 
 void InspectorFrontendClientQt::closeWindow()
 {
-    destroyInspectorView(true);
-}
+    if (m_destroyingInspectorView)
+        return;
+    m_destroyingInspectorView = true;
 
-void InspectorFrontendClientQt::disconnectFromBackend()
-{
-    destroyInspectorView(false);
+    // Clear reference from QWebInspector to the frontend view.
+    m_inspectedWebPage->d->getOrCreateInspector()->d->setFrontend(0);
+#if ENABLE(INSPECTOR)
+    m_inspectedWebPage->d->inspectorController()->disconnectFrontend();
+#endif
+    m_inspectorClient->releaseFrontendPage();
+
+    // Clear pointer before deleting WebView to avoid recursive calls to its destructor.
+    OwnPtr<QWebView> inspectorView = m_inspectorView.release();
 }
 
 void InspectorFrontendClientQt::attachWindow()
@@ -312,24 +319,6 @@ void InspectorFrontendClientQt::updateWindowTitle()
     }
 }
 
-void InspectorFrontendClientQt::destroyInspectorView(bool notifyInspectorController)
-{
-    if (m_destroyingInspectorView)
-        return;
-    m_destroyingInspectorView = true;
-
-    if (notifyInspectorController) {
-        // Clear reference from QWebInspector to the frontend view.
-        m_inspectedWebPage->d->getOrCreateInspector()->d->setFrontend(0);
-#if ENABLE(INSPECTOR)
-        m_inspectedWebPage->d->inspectorController()->disconnectFrontend();
-#endif
-        m_inspectorClient->releaseFrontendPage();
-    }
-
-    // Clear pointer before deleting WebView to avoid recursive calls to its destructor.
-    OwnPtr<QWebView> inspectorView = m_inspectorView.release();
-}
 }
 
 #include "InspectorClientQt.moc"
diff --git a/WebKit/qt/WebCoreSupport/InspectorClientQt.h b/WebKit/qt/WebCoreSupport/InspectorClientQt.h
index 48d8b08..9526c88 100644
--- a/WebKit/qt/WebCoreSupport/InspectorClientQt.h
+++ b/WebKit/qt/WebCoreSupport/InspectorClientQt.h
@@ -79,7 +79,6 @@ public:
 
     virtual void bringToFront();
     virtual void closeWindow();
-    virtual void disconnectFromBackend();
 
     virtual void attachWindow();
     virtual void detachWindow();
@@ -90,7 +89,6 @@ public:
 
 private:
     void updateWindowTitle();
-    void destroyInspectorView(bool notifyInspectorController);
     QWebPage* m_inspectedWebPage;
     OwnPtr<QWebView> m_inspectorView;
     QString m_inspectedURL;
diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index 81a01f5..5940dfe 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,5 +1,16 @@
 2010-08-26  Yury Semikhatsky  <yurys at chromium.org>
 
+        Unreviewed. Revert r66103 since Qt tests are failing.
+
+        * WebCoreSupport/WebInspectorClient.cpp:
+        (WebInspectorFrontendClient::~WebInspectorFrontendClient):
+        (WebInspectorFrontendClient::closeWindow):
+        (WebInspectorFrontendClient::closeWindowWithoutNotifications):
+        (WebInspectorFrontendClient::destroyInspectorView):
+        * WebCoreSupport/WebInspectorClient.h:
+
+2010-08-26  Yury Semikhatsky  <yurys at chromium.org>
+
         Reviewed by Pavel Feldman.
 
         REGRESSION: Crash occurs at objc_msgSend when closing a window that is displaying the web inspector
diff --git a/WebKit/win/WebCoreSupport/WebInspectorClient.cpp b/WebKit/win/WebCoreSupport/WebInspectorClient.cpp
index 1b79dde..34fb827 100644
--- a/WebKit/win/WebCoreSupport/WebInspectorClient.cpp
+++ b/WebKit/win/WebCoreSupport/WebInspectorClient.cpp
@@ -228,7 +228,7 @@ WebInspectorFrontendClient::WebInspectorFrontendClient(WebView* inspectedWebView
 
 WebInspectorFrontendClient::~WebInspectorFrontendClient()
 {
-    destroyInspectorView(true);
+    destroyInspectorView();
 }
 
 void WebInspectorFrontendClient::frontendLoaded()
@@ -260,12 +260,7 @@ void WebInspectorFrontendClient::bringToFront()
 
 void WebInspectorFrontendClient::closeWindow()
 {
-    destroyInspectorView(true);
-}
-
-void WebInspectorFrontendClient::disconnectFromBackend()
-{
-    destroyInspectorView(false);
+    destroyInspectorView();
 }
 
 void WebInspectorFrontendClient::attachWindow()
@@ -349,6 +344,8 @@ void WebInspectorFrontendClient::closeWindowWithoutNotifications()
     HWND hostWindow;
     if (SUCCEEDED(m_inspectedWebView->hostWindow((OLE_HANDLE*)&hostWindow)))
         SendMessage(hostWindow, WM_SIZE, 0, 0);
+
+    m_inspectorClient->updateHighlight();
 }
 
 void WebInspectorFrontendClient::showWindowWithoutNotifications()
@@ -400,20 +397,16 @@ void WebInspectorFrontendClient::showWindowWithoutNotifications()
     m_inspectorClient->updateHighlight();
 }
 
-void WebInspectorFrontendClient::destroyInspectorView(bool notifyInspectorController)
+void WebInspectorFrontendClient::destroyInspectorView()
 {
     if (m_destroyingInspectorView)
         return;
     m_destroyingInspectorView = true;
 
+    m_inspectedWebView->page()->inspectorController()->disconnectFrontend();
 
     closeWindowWithoutNotifications();
-
-    if (notifyInspectorController) {
-        m_inspectedWebView->page()->inspectorController()->disconnectFrontend();
-        m_inspectorClient->updateHighlight();
-        m_inspectorClient->frontendClosing();
-    }
+    m_inspectorClient->frontendClosing();
     ::DestroyWindow(m_frontendHwnd);
 }
 
diff --git a/WebKit/win/WebCoreSupport/WebInspectorClient.h b/WebKit/win/WebCoreSupport/WebInspectorClient.h
index 0c38247..4da3984 100644
--- a/WebKit/win/WebCoreSupport/WebInspectorClient.h
+++ b/WebKit/win/WebCoreSupport/WebInspectorClient.h
@@ -93,7 +93,6 @@ public:
     
     virtual void bringToFront();
     virtual void closeWindow();
-    virtual void disconnectFromBackend();
     
     virtual void attachWindow();
     virtual void detachWindow();
@@ -107,7 +106,7 @@ private:
     void closeWindowWithoutNotifications();
     void showWindowWithoutNotifications();
 
-    void destroyInspectorView(bool notifyInspectorController);
+    void destroyInspectorView();
 
     void updateWindowTitle();
 

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list