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

[eric at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 2f0c9c09082bd667410aa7d9e3d2168327dc0c88
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Aug 9 18:01:28 2010 +0000

    2010-08-09  Balazs Kelemen  <kb at inf.u-szeged.hu>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            [Qt] No need for PageClientImpl
    
            https://bugs.webkit.org/show_bug.cgi?id=43728
    
            Remove PageClientImpl, take the implementation of WebKit::PageClient into QWKPagePrivate.
    
            * UIProcess/API/qt/qwkpage.cpp:
            (QWKPagePrivate::QWKPagePrivate):
            (QWKPagePrivate::toolTipChanged):
            * UIProcess/API/qt/qwkpage_p.h:
            (QWKPagePrivate::pageDidEnterAcceleratedCompositing):
            (QWKPagePrivate::pageDidLeaveAcceleratedCompositing):
            (QWKPagePrivate::processDidExit):
            (QWKPagePrivate::processDidRevive):
            (QWKPagePrivate::setCursor):
            (QWKPagePrivate::takeFocus):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64992 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 9726d57..fea1b6f 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,24 @@
+2010-08-09  Balazs Kelemen  <kb at inf.u-szeged.hu>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] No need for PageClientImpl
+
+        https://bugs.webkit.org/show_bug.cgi?id=43728
+
+        Remove PageClientImpl, take the implementation of WebKit::PageClient into QWKPagePrivate.
+
+        * UIProcess/API/qt/qwkpage.cpp:
+        (QWKPagePrivate::QWKPagePrivate):
+        (QWKPagePrivate::toolTipChanged):
+        * UIProcess/API/qt/qwkpage_p.h:
+        (QWKPagePrivate::pageDidEnterAcceleratedCompositing):
+        (QWKPagePrivate::pageDidLeaveAcceleratedCompositing):
+        (QWKPagePrivate::processDidExit):
+        (QWKPagePrivate::processDidRevive):
+        (QWKPagePrivate::setCursor):
+        (QWKPagePrivate::takeFocus):
+
 2010-08-07  Sam Weinig  <sam at webkit.org>
 
         Reviewed by Anders Carlsson.
diff --git a/WebKit2/UIProcess/API/qt/qwkpage.cpp b/WebKit2/UIProcess/API/qt/qwkpage.cpp
index d17a3c2..7052f57 100644
--- a/WebKit2/UIProcess/API/qt/qwkpage.cpp
+++ b/WebKit2/UIProcess/API/qt/qwkpage.cpp
@@ -37,40 +37,13 @@
 using namespace WebKit;
 using namespace WebCore;
 
-class PageClientImpl : public WebKit::PageClient {
-public:
-    PageClientImpl(QWKPage* page)
-        : m_page(page)
-    {
-    }
-
-#if USE(ACCELERATED_COMPOSITING)
-    void pageDidEnterAcceleratedCompositing() { }
-    void pageDidLeaveAcceleratedCompositing() { }
-#endif // USE(ACCELERATED_COMPOSITING)
-    virtual void processDidExit() { }
-    virtual void processDidRevive() { }
-    virtual void setCursor(const WebCore::Cursor&) { }
-    virtual void takeFocus(bool direction) { }
-
-    virtual void toolTipChanged(const WebCore::String&, const WebCore::String&);
-
-private:
-    QWKPage* m_page;
-};
-
-void PageClientImpl::toolTipChanged(const String&, const String& newTooltip)
-{
-    emit m_page->statusBarMessage(QString(newTooltip));
-}
-
 QWKPagePrivate::QWKPagePrivate(QWKPage* qq, WKPageNamespaceRef namespaceRef)
     : q(qq)
     , createNewPageFn(0)
 {
     memset(actions, 0, sizeof(actions));
     page = toWK(namespaceRef)->createWebPage();
-    page->setPageClient(new PageClientImpl(qq)); // Ownership is passed to the page.
+    page->setPageClient(this);
 }
 
 QWKPagePrivate::~QWKPagePrivate()
@@ -83,6 +56,11 @@ void QWKPagePrivate::init(const QSize& viewportSize, DrawingAreaProxy* proxy)
     page->initializeWebPage(IntSize(viewportSize), proxy);
 }
 
+void QWKPagePrivate::toolTipChanged(const String&, const String& newTooltip)
+{
+    emit q->statusBarMessage(QString(newTooltip));
+}
+
 void QWKPagePrivate::paint(QPainter* painter, QRect area)
 {
     painter->save();
diff --git a/WebKit2/UIProcess/API/qt/qwkpage_p.h b/WebKit2/UIProcess/API/qt/qwkpage_p.h
index 0c617a3..e725379 100644
--- a/WebKit2/UIProcess/API/qt/qwkpage_p.h
+++ b/WebKit2/UIProcess/API/qt/qwkpage_p.h
@@ -31,7 +31,7 @@
 #include <QGraphicsView>
 #include <QKeyEvent>
 
-class QWKPagePrivate {
+class QWKPagePrivate : WebKit::PageClient {
 public:
     QWKPagePrivate(QWKPage*, WKPageNamespaceRef);
     ~QWKPagePrivate();
@@ -40,6 +40,17 @@ public:
 
     void init(const QSize& viewportSize, WebKit::DrawingAreaProxy*);
 
+    // PageClient
+#if USE(ACCELERATED_COMPOSITING)
+    void pageDidEnterAcceleratedCompositing() { }
+    void pageDidLeaveAcceleratedCompositing() { }
+#endif // USE(ACCELERATED_COMPOSITING)
+    virtual void processDidExit() { }
+    virtual void processDidRevive() { }
+    virtual void setCursor(const WebCore::Cursor&) { }
+    virtual void takeFocus(bool direction) { }
+    virtual void toolTipChanged(const WebCore::String&, const WebCore::String&);
+
     void paint(QPainter* painter, QRect);
 
     void keyPressEvent(QKeyEvent*);

-- 
WebKit Debian packaging