From df772c123a28e6399d64ea9f5001686331f67dd2 Mon Sep 17 00:00:00 2001 From: "alexis.menard@openbossa.org" Date: Thu, 17 Nov 2011 14:51:52 +0000 Subject: [PATCH] [Qt][WK2] Cleanup dead code in QtWebPageProxy. https://bugs.webkit.org/show_bug.cgi?id=72608 Reviewed by Simon Hausmann. Remove some dead code after we merged our views. QQuickWebView is now using AC which means that this path is never called now. * UIProcess/qt/QtWebPageProxy.cpp: (QtWebPageProxy::didReceiveDownloadResponse): * UIProcess/qt/QtWebPageProxy.h: git-svn-id: http://svn.webkit.org/repository/webkit/trunk@100617 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Source/WebKit2/ChangeLog | 15 +++++++++++++++ Source/WebKit2/UIProcess/qt/QtWebPageProxy.cpp | 15 --------------- Source/WebKit2/UIProcess/qt/QtWebPageProxy.h | 3 --- 3 files changed, 15 insertions(+), 18 deletions(-) diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog index 8d215e7..d865409 100644 --- a/Source/WebKit2/ChangeLog +++ b/Source/WebKit2/ChangeLog @@ -1,3 +1,18 @@ +2011-11-17 Alexis Menard + + [Qt][WK2] Cleanup dead code in QtWebPageProxy. + https://bugs.webkit.org/show_bug.cgi?id=72608 + + Reviewed by Simon Hausmann. + + Remove some dead code after we merged our views. + QQuickWebView is now using AC which means that this + path is never called now. + + * UIProcess/qt/QtWebPageProxy.cpp: + (QtWebPageProxy::didReceiveDownloadResponse): + * UIProcess/qt/QtWebPageProxy.h: + 2011-11-17 Tor Arne Vestbø [Qt] Remove forwarding header for WebKit2 C API diff --git a/Source/WebKit2/UIProcess/qt/QtWebPageProxy.cpp b/Source/WebKit2/UIProcess/qt/QtWebPageProxy.cpp index 488f4ce..e7c5cb1 100644 --- a/Source/WebKit2/UIProcess/qt/QtWebPageProxy.cpp +++ b/Source/WebKit2/UIProcess/qt/QtWebPageProxy.cpp @@ -607,14 +607,6 @@ void QtWebPageProxy::didChangeLoadProgress(int newLoadProgress) m_viewInterface->didChangeLoadProgress(newLoadProgress); } -void QtWebPageProxy::paint(QPainter* painter, const QRect& area) -{ - if (m_webPageProxy->isValid()) - paintContent(painter, area); - else - painter->fillRect(area, Qt::white); -} - bool QtWebPageProxy::canGoBack() const { return m_webPageProxy->canGoBack(); @@ -821,13 +813,6 @@ void QtWebPageProxy::didReceiveDownloadResponse(QWebDownloadItem* download) m_viewInterface->downloadRequested(download); } -void QtWebPageProxy::paintContent(QPainter* painter, const QRect& area) -{ - // FIXME: Do something with the unpainted region? - WebCore::Region unpaintedRegion; - static_cast(m_webPageProxy->drawingArea())->paint(painter, area, unpaintedRegion); -} - PassOwnPtr QtWebPageProxy::createDrawingAreaProxy() { return DrawingAreaProxyImpl::create(m_webPageProxy.get()); diff --git a/Source/WebKit2/UIProcess/qt/QtWebPageProxy.h b/Source/WebKit2/UIProcess/qt/QtWebPageProxy.h index 4c7750e..4733642 100644 --- a/Source/WebKit2/UIProcess/qt/QtWebPageProxy.h +++ b/Source/WebKit2/UIProcess/qt/QtWebPageProxy.h @@ -147,8 +147,6 @@ public: void didChangeLoadProgress(int); int loadProgress() const { return m_loadProgress; } - void paint(QPainter*, const QRect&); - bool canGoBack() const; void goBack(); bool canGoForward() const; @@ -211,7 +209,6 @@ public: Q_SIGNAL void receivedMessageFromNavigatorQtObject(const QVariantMap&); protected: - virtual void paintContent(QPainter* painter, const QRect& area); RefPtr m_webPageProxy; WebKit::QtViewInterface* const m_viewInterface; QtViewportInteractionEngine* m_interactionEngine; -- 1.8.3.1