summaryrefslogtreecommitdiff
path: root/Source/WebKit2/UIProcess/qt/QtPageClient.cpp
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@digia.com>2012-10-16 14:56:46 +0200
committerSimon Hausmann <simon.hausmann@digia.com>2012-10-16 14:57:30 +0200
commitb297e0fa5c217c9467033b7c8b46891a52870120 (patch)
tree43fc14689295e9e64f2719d05aad94e3049f6cd7 /Source/WebKit2/UIProcess/qt/QtPageClient.cpp
parent69d517dbfa69903d8593cc1737f0474b21e3251e (diff)
downloadqtwebkit-b297e0fa5c217c9467033b7c8b46891a52870120.tar.gz
Revert "Imported WebKit commit 0dc6cd75e1d4836eaffbb520be96fac4847cc9d2 (http://svn.webkit.org/repository/webkit/trunk@131300)"
This reverts commit 5466563f4b5b6b86523e3f89bb7f77e5b5270c78. Caused OOM issues on some CI machines :(
Diffstat (limited to 'Source/WebKit2/UIProcess/qt/QtPageClient.cpp')
-rw-r--r--Source/WebKit2/UIProcess/qt/QtPageClient.cpp21
1 files changed, 1 insertions, 20 deletions
diff --git a/Source/WebKit2/UIProcess/qt/QtPageClient.cpp b/Source/WebKit2/UIProcess/qt/QtPageClient.cpp
index 7737f6529..d5a5f7ece 100644
--- a/Source/WebKit2/UIProcess/qt/QtPageClient.cpp
+++ b/Source/WebKit2/UIProcess/qt/QtPageClient.cpp
@@ -73,16 +73,6 @@ void QtPageClient::setViewNeedsDisplay(const WebCore::IntRect& rect)
QQuickWebViewPrivate::get(m_webView)->setNeedsDisplay();
}
-void QtPageClient::didRenderFrame(const WebCore::IntSize& contentsSize, const WebCore::IntRect& coveredRect)
-{
- // The viewport has to be notified first so that the viewport position
- // is adjusted before the loadVisuallyCommitted() signal.
- PageViewportController* pvc = QQuickWebViewPrivate::get(m_webView)->viewportController();
- if (pvc)
- pvc->didRenderFrame(contentsSize, coveredRect);
- QQuickWebViewPrivate::get(m_webView)->didRenderFrame();
-}
-
void QtPageClient::pageDidRequestScroll(const IntPoint& pos)
{
QQuickWebViewPrivate::get(m_webView)->pageDidRequestScroll(pos);
@@ -100,9 +90,7 @@ void QtPageClient::didRelaunchProcess()
void QtPageClient::didChangeContentsSize(const IntSize& newSize)
{
- PageViewportController* pvc = QQuickWebViewPrivate::get(m_webView)->viewportController();
- if (pvc)
- pvc->didChangeContentsSize(newSize);
+ QQuickWebViewPrivate::get(m_webView)->didChangeContentsSize(newSize);
}
void QtPageClient::didChangeViewportProperties(const WebCore::ViewportAttributes& attr)
@@ -232,13 +220,6 @@ void QtPageClient::flashBackingStoreUpdates(const Vector<IntRect>&)
notImplemented();
}
-void QtPageClient::pageTransitionViewportReady()
-{
- PageViewportController* pvc = QQuickWebViewPrivate::get(m_webView)->viewportController();
- if (pvc)
- pvc->pageTransitionViewportReady();
-}
-
void QtPageClient::didFindZoomableArea(const IntPoint& target, const IntRect& area)
{
ASSERT(m_eventHandler);