Implement QWebEnginePage::viewportSize

Keep the size in the page itself, and ask the optionally attached
QWebEngineView only for the rect position.
When the view size change, call setViewportSize on the page like
QtWebKit does.

Change-Id: I735f1509cab9ef9b5d32bf31249a59c919939804
Reviewed-by: Andras Becsi <andras.becsi@digia.com>

1 files changed, 6 insertions, 5 deletions

diff --git a/src/webenginewidgets/render_widget_host_view_qt_delegate_webpage.cpp b/src/webenginewidgets/render_widget_host_view_qt_delegate_webpage.cpp
index 2da55f66e..d6e99f4ea 100644
--- a/src/webenginewidgets/render_widget_host_view_qt_delegate_webpage.cpp
+++ b/src/webenginewidgets/render_widget_host_view_qt_delegate_webpage.cpp
@@ -54,21 +54,22 @@
 RenderWidgetHostViewQtDelegateWebPage::RenderWidgetHostViewQtDelegateWebPage(RenderWidgetHostViewQtDelegateClient *client)
     : m_client(client)
     , m_page(0)
+    , m_pagePrivate(0)
 {
 }
 
 void RenderWidgetHostViewQtDelegateWebPage::initAsChild(WebContentsAdapterClient* container)
 {
-    QWebEnginePagePrivate *pagePrivate = static_cast<QWebEnginePagePrivate *>(container);
-    pagePrivate->m_rwhvDelegate = this;
-    m_page = pagePrivate->q_func();
+    m_pagePrivate = static_cast<QWebEnginePagePrivate *>(container);
+    m_pagePrivate->m_rwhvDelegate = this;
+    m_page = m_pagePrivate->q_func();
     Q_ASSERT(m_page);
 }
 
 QRectF RenderWidgetHostViewQtDelegateWebPage::screenRect() const
 {
-    if (m_page && m_page->view())
-        return m_page->view()->rect();
+    if (m_pagePrivate)
+        return m_pagePrivate->viewportRect();
     // FIXME: figure out what to do with QWebFrame::contentsSize vs. preferedContentsSize
     return QRectF(0, 0, 800, 600);
 }