Changeset 64122 in webkit
- Timestamp:
- Jul 27, 2010 5:27:29 AM (14 years ago)
- Location:
- trunk/WebKit2
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebKit2/ChangeLog
r64096 r64122 1 2010-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 1 21 2010-07-26 Darin Adler <darin@apple.com> 2 22 -
trunk/WebKit2/UIProcess/API/qt/qwkpage.cpp
r63256 r64122 38 38 using namespace WebCore; 39 39 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 40 67 QWKPagePrivate::QWKPagePrivate(QWKPage* qq, WKPageNamespaceRef namespaceRef) 41 68 : q(qq) … … 44 71 memset(actions, 0, sizeof(actions)); 45 72 page = toWK(namespaceRef)->createWebPage(); 46 page->setPageClient( this);73 page->setPageClient(new PageClientImpl(qq)); // Ownership is passed to the page. 47 74 } 48 75 … … 55 82 { 56 83 page->initializeWebPage(IntSize(viewportSize), proxy); 57 }58 59 void QWKPagePrivate::toolTipChanged(const String&, const String& newTooltip)60 {61 emit q->statusBarMessage(QString(newTooltip));62 84 } 63 85 -
trunk/WebKit2/UIProcess/API/qt/qwkpage_p.h
r63903 r64122 32 32 #include <QKeyEvent> 33 33 34 class QWKPagePrivate : public WebKit::PageClient{34 class QWKPagePrivate { 35 35 public: 36 36 QWKPagePrivate(QWKPage*, WKPageNamespaceRef); … … 40 40 41 41 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&);52 42 53 43 void paint(QPainter* painter, QRect);
Note: See TracChangeset
for help on using the changeset viewer.