Changeset 64992 in webkit


Ignore:
Timestamp:
Aug 9, 2010 11:01:28 AM (14 years ago)
Author:
eric@webkit.org
Message:

2010-08-09 Balazs Kelemen <kb@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):
Location:
trunk/WebKit2
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebKit2/ChangeLog

    r64928 r64992  
     12010-08-09  Balazs Kelemen  <kb@inf.u-szeged.hu>
     2
     3        Reviewed by Kenneth Rohde Christiansen.
     4
     5        [Qt] No need for PageClientImpl
     6
     7        https://bugs.webkit.org/show_bug.cgi?id=43728
     8
     9        Remove PageClientImpl, take the implementation of WebKit::PageClient into QWKPagePrivate.
     10
     11        * UIProcess/API/qt/qwkpage.cpp:
     12        (QWKPagePrivate::QWKPagePrivate):
     13        (QWKPagePrivate::toolTipChanged):
     14        * UIProcess/API/qt/qwkpage_p.h:
     15        (QWKPagePrivate::pageDidEnterAcceleratedCompositing):
     16        (QWKPagePrivate::pageDidLeaveAcceleratedCompositing):
     17        (QWKPagePrivate::processDidExit):
     18        (QWKPagePrivate::processDidRevive):
     19        (QWKPagePrivate::setCursor):
     20        (QWKPagePrivate::takeFocus):
     21
    1222010-08-07  Sam Weinig  <sam@webkit.org>
    223
  • trunk/WebKit2/UIProcess/API/qt/qwkpage.cpp

    r64355 r64992  
    3838using namespace WebCore;
    3939
    40 class PageClientImpl : public WebKit::PageClient {
    41 public:
    42     PageClientImpl(QWKPage* page)
    43         : m_page(page)
    44     {
    45     }
    46 
    47 #if USE(ACCELERATED_COMPOSITING)
    48     void pageDidEnterAcceleratedCompositing() { }
    49     void pageDidLeaveAcceleratedCompositing() { }
    50 #endif // USE(ACCELERATED_COMPOSITING)
    51     virtual void processDidExit() { }
    52     virtual void processDidRevive() { }
    53     virtual void setCursor(const WebCore::Cursor&) { }
    54     virtual void takeFocus(bool direction) { }
    55 
    56     virtual void toolTipChanged(const WebCore::String&, const WebCore::String&);
    57 
    58 private:
    59     QWKPage* m_page;
    60 };
    61 
    62 void PageClientImpl::toolTipChanged(const String&, const String& newTooltip)
    63 {
    64     emit m_page->statusBarMessage(QString(newTooltip));
    65 }
    66 
    6740QWKPagePrivate::QWKPagePrivate(QWKPage* qq, WKPageNamespaceRef namespaceRef)
    6841    : q(qq)
     
    7144    memset(actions, 0, sizeof(actions));
    7245    page = toWK(namespaceRef)->createWebPage();
    73     page->setPageClient(new PageClientImpl(qq)); // Ownership is passed to the page.
     46    page->setPageClient(this);
    7447}
    7548
     
    8255{
    8356    page->initializeWebPage(IntSize(viewportSize), proxy);
     57}
     58
     59void QWKPagePrivate::toolTipChanged(const String&, const String& newTooltip)
     60{
     61    emit q->statusBarMessage(QString(newTooltip));
    8462}
    8563
  • trunk/WebKit2/UIProcess/API/qt/qwkpage_p.h

    r64122 r64992  
    3232#include <QKeyEvent>
    3333
    34 class QWKPagePrivate {
     34class QWKPagePrivate : WebKit::PageClient {
    3535public:
    3636    QWKPagePrivate(QWKPage*, WKPageNamespaceRef);
     
    4040
    4141    void init(const QSize& viewportSize, WebKit::DrawingAreaProxy*);
     42
     43    // PageClient
     44#if USE(ACCELERATED_COMPOSITING)
     45    void pageDidEnterAcceleratedCompositing() { }
     46    void pageDidLeaveAcceleratedCompositing() { }
     47#endif // USE(ACCELERATED_COMPOSITING)
     48    virtual void processDidExit() { }
     49    virtual void processDidRevive() { }
     50    virtual void setCursor(const WebCore::Cursor&) { }
     51    virtual void takeFocus(bool direction) { }
     52    virtual void toolTipChanged(const WebCore::String&, const WebCore::String&);
    4253
    4354    void paint(QPainter* painter, QRect);
Note: See TracChangeset for help on using the changeset viewer.