Changeset 130629 in webkit

Timestamp:

Oct 8, 2012, 3:41:27 AM (14 years ago)

Author:

jocelyn.turcotte@digia.com

Message:

[Qt] Prevent the PageViewportController from affecting the viewport in desktop mode
​https://bugs.webkit.org/show_bug.cgi?id=98427

Reviewed by Kenneth Rohde Christiansen.

QQuickFlickable isn't tightly bound to it anymore, we can avoid creating it
completely in this case.

• UIProcess/API/qt/qquickwebview.cpp:

(QQuickWebViewFlickablePrivate::onComponentComplete):

• UIProcess/API/qt/qquickwebview_p_p.h:

(QQuickWebViewPrivate::onComponentComplete):
(QQuickWebViewPrivate::viewportController):
(QQuickWebViewPrivate):
(QQuickWebViewFlickablePrivate::viewportController):
(QQuickWebViewFlickablePrivate):

• UIProcess/qt/QtPageClient.cpp:

(WebKit::QtPageClient::didRenderFrame):
(WebKit::QtPageClient::didChangeContentsSize):
(WebKit::QtPageClient::pageTransitionViewportReady):

• UIProcess/qt/QtWebPageLoadClient.cpp:

(WebKit::QtWebPageLoadClient::didCommitLoad):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/qt/qquickwebview.cpp (modified) (2 diffs)
• UIProcess/API/qt/qquickwebview_p_p.h (modified) (4 diffs)
• UIProcess/qt/QtPageClient.cpp (modified) (3 diffs)
• UIProcess/qt/QtWebPageLoadClient.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-10-04  Jocelyn Turcotte  <jocelyn.turcotte@digia.com>
+
+        [Qt] Prevent the PageViewportController from affecting the viewport in desktop mode
+        https://bugs.webkit.org/show_bug.cgi?id=98427
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        QQuickFlickable isn't tightly bound to it anymore, we can avoid creating it
+        completely in this case.
+
+        * UIProcess/API/qt/qquickwebview.cpp:
+        (QQuickWebViewFlickablePrivate::onComponentComplete):
+        * UIProcess/API/qt/qquickwebview_p_p.h:
+        (QQuickWebViewPrivate::onComponentComplete):
+        (QQuickWebViewPrivate::viewportController):
+        (QQuickWebViewPrivate):
+        (QQuickWebViewFlickablePrivate::viewportController):
+        (QQuickWebViewFlickablePrivate):
+        * UIProcess/qt/QtPageClient.cpp:
+        (WebKit::QtPageClient::didRenderFrame):
+        (WebKit::QtPageClient::didChangeContentsSize):
+        (WebKit::QtPageClient::pageTransitionViewportReady):
+        * UIProcess/qt/QtWebPageLoadClient.cpp:
+        (WebKit::QtWebPageLoadClient::didCommitLoad):
+
 2012-10-04  Jocelyn Turcotte  <jocelyn.turcotte@digia.com>
 

trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp

@@ -332 +332 @@
 }
 
-void QQuickWebViewPrivate::onComponentComplete()
-{
-    Q_Q(QQuickWebView);
-    m_pageViewportControllerClient.reset(new PageViewportControllerClientQt(q, pageView.data()));
-    m_pageViewportController.reset(new PageViewportController(webPageProxy.get(), m_pageViewportControllerClient.data()));
-    pageView->eventHandler()->setViewportController(m_pageViewportControllerClient.data());
-}
-
 void QQuickWebViewPrivate::setTransparentBackground(bool enable)
 {
@@ -861 +853 @@
 {
     QQuickWebViewPrivate::onComponentComplete();
+
+    Q_Q(QQuickWebView);
+    m_pageViewportControllerClient.reset(new PageViewportControllerClientQt(q, pageView.data()));
+    m_pageViewportController.reset(new PageViewportController(webPageProxy.get(), m_pageViewportControllerClient.data()));
+    pageView->eventHandler()->setViewportController(m_pageViewportControllerClient.data());
 
     // Trigger setting of correct visibility flags after everything was allocated and initialized.

trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p_p.h

@@ -71 +71 @@
     virtual void initialize(WKContextRef contextRef = 0, WKPageGroupRef pageGroupRef = 0);
 
-    virtual void onComponentComplete();
+    virtual void onComponentComplete() { }
 
     virtual void provisionalLoadDidStart(const WTF::String& url);
@@ -91 +91 @@
     void didRenderFrame();
 
-    WebKit::PageViewportController* viewportController() const { return m_pageViewportController.data(); }
+    virtual WebKit::PageViewportController* viewportController() const { return 0; }
     virtual void updateViewportSize() { }
     void updateTouchViewportSize();
@@ -172 +172 @@
     QScopedPointer<QQuickWebPage> pageView;
     QQuickWebView* q_ptr;
-
-    QScopedPointer<WebKit::PageViewportController> m_pageViewportController;
-    QScopedPointer<WebKit::PageViewportControllerClientQt> m_pageViewportControllerClient;
 
     FlickableAxisLocker axisLocker;
@@ -222 +219 @@
 
     virtual void didChangeViewportProperties(const WebCore::ViewportAttributes&);
+    virtual WebKit::PageViewportController* viewportController() const { return m_pageViewportController.data(); }
     virtual void updateViewportSize();
 
     virtual void pageDidRequestScroll(const QPoint& pos);
     virtual void handleMouseEvent(QMouseEvent*);
+
+private:
+    QScopedPointer<WebKit::PageViewportController> m_pageViewportController;
+    QScopedPointer<WebKit::PageViewportControllerClientQt> m_pageViewportControllerClient;
 };
 

trunk/Source/WebKit2/UIProcess/qt/QtPageClient.cpp

@@ -78 +78 @@
     // The viewport has to be notified first so that the viewport position
     // is adjusted before the loadVisuallyCommitted() signal.
-    QQuickWebViewPrivate::get(m_webView)->viewportController()->didRenderFrame(contentsSize, coveredRect);
+    PageViewportController* pvc = QQuickWebViewPrivate::get(m_webView)->viewportController();
+    if (pvc)
+        pvc->didRenderFrame(contentsSize, coveredRect);
     QQuickWebViewPrivate::get(m_webView)->didRenderFrame();
 }
@@ -99 +101 @@
 void QtPageClient::didChangeContentsSize(const IntSize& newSize)
 {
-    QQuickWebViewPrivate::get(m_webView)->viewportController()->didChangeContentsSize(newSize);
+    PageViewportController* pvc = QQuickWebViewPrivate::get(m_webView)->viewportController();
+    if (pvc)
+        pvc->didChangeContentsSize(newSize);
 }
 
@@ -231 +235 @@
 void QtPageClient::pageTransitionViewportReady()
 {
-    QQuickWebViewPrivate::get(m_webView)->viewportController()->pageTransitionViewportReady();
+    PageViewportController* pvc = QQuickWebViewPrivate::get(m_webView)->viewportController();
+    if (pvc)
+        pvc->pageTransitionViewportReady();
 }
 

trunk/Source/WebKit2/UIProcess/qt/QtWebPageLoadClient.cpp

@@ -63 +63 @@
 void QtWebPageLoadClient::didCommitLoad()
 {
-    m_webView->d_func()->viewportController()->didCommitLoad();
+    PageViewportController* pvc = m_webView->d_func()->viewportController();
+    if (pvc)
+        pvc->didCommitLoad();
     m_webView->d_func()->loadDidCommit();
 }