Changeset 64122 in webkit


Ignore:
Timestamp:
Jul 27, 2010 5:27:29 AM (14 years ago)
Author:
commit-queue@webkit.org
Message:

2010-07-27 Balazs Kelemen <​kb@inf.u-szeged.hu>

Reviewed by Kenneth Rohde Christiansen.

[Qt] WebKit::PageClient implementation needs a dedicated class

​https://bugs.webkit.org/show_bug.cgi?id=42974

  • UIProcess/API/qt/qwkpage.cpp: (PageClientImpl::PageClientImpl): Added. (PageClientImpl::pageDidEnterAcceleratedCompositing): Moved from QWKPagePrivate. (PageClientImpl::pageDidLeaveAcceleratedCompositing): Ditto. (PageClientImpl::processDidExit): Ditto. (PageClientImpl::processDidRevive): Ditto. (PageClientImpl::setCursor): Ditto. (PageClientImpl::takeFocus): Ditto. (PageClientImpl::toolTipChanged): Ditto. (QWKPagePrivate::QWKPagePrivate): Set a new instance of the PageClientImpl as PageClient rather than 'this'.
  • UIProcess/API/qt/qwkpage_p.h: Removed PageClient implementation methods from QWKPagePrivate.
Location:
trunk/WebKit2
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebKit2/ChangeLog

    r64096 r64122  
     12010-07-27  Balazs Kelemen  <kb@inf.u-szeged.hu>
     2
     3        Reviewed by Kenneth Rohde Christiansen.
     4
     5        [Qt] WebKit::PageClient implementation needs a dedicated class
     6
     7        https://bugs.webkit.org/show_bug.cgi?id=42974
     8
     9        * UIProcess/API/qt/qwkpage.cpp:
     10        (PageClientImpl::PageClientImpl): Added.
     11        (PageClientImpl::pageDidEnterAcceleratedCompositing): Moved from QWKPagePrivate.
     12        (PageClientImpl::pageDidLeaveAcceleratedCompositing): Ditto.
     13        (PageClientImpl::processDidExit): Ditto.
     14        (PageClientImpl::processDidRevive): Ditto.
     15        (PageClientImpl::setCursor): Ditto.
     16        (PageClientImpl::takeFocus): Ditto.
     17        (PageClientImpl::toolTipChanged): Ditto.
     18        (QWKPagePrivate::QWKPagePrivate): Set a new instance of the PageClientImpl as PageClient rather than 'this'.
     19        * UIProcess/API/qt/qwkpage_p.h: Removed PageClient implementation methods from QWKPagePrivate.
     20
    1212010-07-26  Darin Adler  <darin@apple.com>
    222

  • trunk/WebKit2/UIProcess/API/qt/qwkpage.cpp

    r63256 r64122  
    3838using namespace WebCore;
    3939
     40class PageClientImpl : public WebKit::PageClient {
     41public:
     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
     58private:
     59    QWKPage* m_page;
     60};
     61
     62void PageClientImpl::toolTipChanged(const String&, const String& newTooltip)
     63{
     64    emit m_page->statusBarMessage(QString(newTooltip));
     65}
     66
    4067QWKPagePrivate::QWKPagePrivate(QWKPage* qq, WKPageNamespaceRef namespaceRef)
    4168    : q(qq)
    … …  
    4471    memset(actions, 0, sizeof(actions));
    4572    page = toWK(namespaceRef)->createWebPage();
    46     page->setPageClient(this);
     73    page->setPageClient(new PageClientImpl(qq)); // Ownership is passed to the page.
    4774}
    4875
    … …  
    5582{
    5683    page->initializeWebPage(IntSize(viewportSize), proxy);
    57 }
    58 
    59 void QWKPagePrivate::toolTipChanged(const String&, const String& newTooltip)
    60 {
    61     emit q->statusBarMessage(QString(newTooltip));
    6284}
    6385

  • trunk/WebKit2/UIProcess/API/qt/qwkpage_p.h

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