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

[timothy at apple.com]

The following commit has been merged in the debian/experimental branch:
commit d99c8aeb3e19a6b79ba9a5ac8789e7db71499064
Author: timothy at apple.com <timothy at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 2 15:22:12 2010 +0000

    Make WebInspectorFrontendClient inherit from InspectorFrontendClientLocal.
    
    We can do this since the Web Inspector WebPage will share the same process
    with the inspected WebPage.
    
    https://webkit.org/b/48652
    
    Reviewed by Pavel Feldman.
    
    * WebProcess/WebCoreSupport/WebInspectorFrontendClient.cpp:
    (WebKit::WebInspectorFrontendClient::WebInspectorFrontendClient):
    Call the InspectorFrontendClientLocal constructor.
    (WebKit::WebInspectorFrontendClient::attachWindow): Added.
    (WebKit::WebInspectorFrontendClient::detachWindow): Added.
    (WebKit::WebInspectorFrontendClient::setAttachedWindowHeight): Added.
    * WebProcess/WebCoreSupport/WebInspectorFrontendClient.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71114 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 2a8994a..1072803 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,22 @@
+2010-11-02  Timothy Hatcher  <timothy at apple.com>
+
+        Make WebInspectorFrontendClient inherit from InspectorFrontendClientLocal.
+
+        We can do this since the Web Inspector WebPage will share the same process
+        with the inspected WebPage.
+
+        https://webkit.org/b/48652
+
+        Reviewed by Pavel Feldman.
+
+        * WebProcess/WebCoreSupport/WebInspectorFrontendClient.cpp:
+        (WebKit::WebInspectorFrontendClient::WebInspectorFrontendClient):
+        Call the InspectorFrontendClientLocal constructor.
+        (WebKit::WebInspectorFrontendClient::attachWindow): Added.
+        (WebKit::WebInspectorFrontendClient::detachWindow): Added.
+        (WebKit::WebInspectorFrontendClient::setAttachedWindowHeight): Added.
+        * WebProcess/WebCoreSupport/WebInspectorFrontendClient.h:
+
 2010-11-01  Juha Savolainen  <juha.savolainen at weego.fi>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebKit2/WebProcess/WebCoreSupport/WebInspectorFrontendClient.cpp b/WebKit2/WebProcess/WebCoreSupport/WebInspectorFrontendClient.cpp
index 7476fe5..f731f55 100644
--- a/WebKit2/WebProcess/WebCoreSupport/WebInspectorFrontendClient.cpp
+++ b/WebKit2/WebProcess/WebCoreSupport/WebInspectorFrontendClient.cpp
@@ -25,6 +25,8 @@
 
 #include "WebInspectorFrontendClient.h"
 
+#include "WebPage.h"
+#include <WebCore/Page.h>
 #include <wtf/text/WTFString.h>
 
 #define DISABLE_NOT_IMPLEMENTED_WARNINGS 1
@@ -34,19 +36,10 @@ using namespace WebCore;
 
 namespace WebKit {
 
-void WebInspectorFrontendClient::windowObjectCleared()
+WebInspectorFrontendClient::WebInspectorFrontendClient(WebPage* page, WebPage* inspectorPage)
+    : InspectorFrontendClientLocal(page->corePage()->inspectorController(), inspectorPage->corePage())
+    , m_page(page)
 {
-    notImplemented();
-}
-
-void WebInspectorFrontendClient::frontendLoaded()
-{
-    notImplemented();
-}
-
-void WebInspectorFrontendClient::moveWindowBy(float, float)
-{
-    notImplemented();
 }
 
 String WebInspectorFrontendClient::localizedStringsURL()
@@ -76,17 +69,17 @@ void WebInspectorFrontendClient::disconnectFromBackend()
     notImplemented();
 }
 
-void WebInspectorFrontendClient::requestAttachWindow()
+void WebInspectorFrontendClient::attachWindow()
 {
     notImplemented();
 }
 
-void WebInspectorFrontendClient::requestDetachWindow()
+void WebInspectorFrontendClient::detachWindow()
 {
     notImplemented();
 }
 
-void WebInspectorFrontendClient::changeAttachedWindowHeight(unsigned)
+void WebInspectorFrontendClient::setAttachedWindowHeight(unsigned)
 {
     notImplemented();
 }
diff --git a/WebKit2/WebProcess/WebCoreSupport/WebInspectorFrontendClient.h b/WebKit2/WebProcess/WebCoreSupport/WebInspectorFrontendClient.h
index a218eb8..f29ee1c 100644
--- a/WebKit2/WebProcess/WebCoreSupport/WebInspectorFrontendClient.h
+++ b/WebKit2/WebProcess/WebCoreSupport/WebInspectorFrontendClient.h
@@ -26,25 +26,17 @@
 #ifndef WebInspectorFrontendClient_h
 #define WebInspectorFrontendClient_h
 
-#include <WebCore/InspectorFrontendClient.h>
+#include <WebCore/InspectorFrontendClientLocal.h>
 
 namespace WebKit {
 
 class WebPage;
 
-class WebInspectorFrontendClient : public WebCore::InspectorFrontendClient {
+class WebInspectorFrontendClient : public WebCore::InspectorFrontendClientLocal {
 public:
-    WebInspectorFrontendClient(WebPage* page)
-        : m_page(page)
-    {
-    }
+    WebInspectorFrontendClient(WebPage* page, WebPage* inspectorPage);
 
 private:
-    virtual void windowObjectCleared();
-    virtual void frontendLoaded();
-
-    virtual void moveWindowBy(float x, float y);
-
     virtual String localizedStringsURL();
     virtual String hiddenPanels();
 
@@ -52,9 +44,9 @@ private:
     virtual void closeWindow();
     virtual void disconnectFromBackend();
 
-    virtual void requestAttachWindow();
-    virtual void requestDetachWindow();
-    virtual void changeAttachedWindowHeight(unsigned);
+    virtual void attachWindow();
+    virtual void detachWindow();
+    virtual void setAttachedWindowHeight(unsigned);
 
     virtual void inspectedURLChanged(const String&);
 

-- 
WebKit Debian packaging