Imported WebKit commit 0dc6cd75e1d4836eaffbb520be96fac4847cc9d2 (http://svn.webkit.org/repository/webkit/trunk@131300)

WebKit update which introduces the QtWebKitWidgets module that contains the WK1
widgets based API. (In fact it renames QtWebKit to QtWebKitWidgets while we're
working on completing the entire split as part of
https://bugs.webkit.org/show_bug.cgi?id=99314

1 files changed, 20 insertions, 1 deletions

diff --git a/Source/WebKit2/UIProcess/qt/QtPageClient.cpp b/Source/WebKit2/UIProcess/qt/QtPageClient.cpp
index d5a5f7ece..7737f6529 100644
--- a/Source/WebKit2/UIProcess/qt/QtPageClient.cpp
+++ b/Source/WebKit2/UIProcess/qt/QtPageClient.cpp
@@ -73,6 +73,16 @@ 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);
@@ -90,7 +100,9 @@ void QtPageClient::didRelaunchProcess()
 
 void QtPageClient::didChangeContentsSize(const IntSize& newSize)
 {
-    QQuickWebViewPrivate::get(m_webView)->didChangeContentsSize(newSize);
+    PageViewportController* pvc = QQuickWebViewPrivate::get(m_webView)->viewportController();
+    if (pvc)
+        pvc->didChangeContentsSize(newSize);
 }
 
 void QtPageClient::didChangeViewportProperties(const WebCore::ViewportAttributes& attr)
@@ -220,6 +232,13 @@ 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);