Changeset 128035 in webkit

Timestamp:

Sep 10, 2012 2:27:02 AM (12 years ago)

Author:

abecsi@webkit.org

Message:

[Qt][WK2] QWebKitTest should retrieve the viewport state from the PageViewportController
​https://bugs.webkit.org/show_bug.cgi?id=96106

Reviewed by Simon Hausmann.

The functions in PageViewportControllerClientQt proxying the
viewport state values can be removed if QWebKitTest uses the
PageViewportController to retrieve these values.

• UIProcess/API/qt/qquickwebview_p_p.h:

(QQuickWebViewPrivate::viewportController):

• UIProcess/API/qt/qwebkittest.cpp:

(QWebKitTest::viewport):
(QWebKitTest::devicePixelRatio):
(QWebKitTest::contentsScale):

• UIProcess/PageViewportController.h:

(WebKit::PageViewportController::currentContentsScale):

• UIProcess/qt/PageViewportControllerClientQt.cpp:
• UIProcess/qt/PageViewportControllerClientQt.h:

(PageViewportControllerClientQt):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/qt/qquickwebview_p_p.h (modified) (1 diff)
• UIProcess/API/qt/qwebkittest.cpp (modified) (3 diffs)
• UIProcess/PageViewportController.h (modified) (1 diff)
• UIProcess/qt/PageViewportControllerClientQt.cpp (modified) (1 diff)
• UIProcess/qt/PageViewportControllerClientQt.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-09-10  Andras Becsi  <andras.becsi@nokia.com>
+
+        [Qt][WK2] QWebKitTest should retrieve the viewport state from the PageViewportController
+        https://bugs.webkit.org/show_bug.cgi?id=96106
+
+        Reviewed by Simon Hausmann.
+
+        The functions in PageViewportControllerClientQt proxying the
+        viewport state values can be removed if QWebKitTest uses the
+        PageViewportController to retrieve these values.
+
+        * UIProcess/API/qt/qquickwebview_p_p.h:
+        (QQuickWebViewPrivate::viewportController):
+        * UIProcess/API/qt/qwebkittest.cpp:
+        (QWebKitTest::viewport):
+        (QWebKitTest::devicePixelRatio):
+        (QWebKitTest::contentsScale):
+        * UIProcess/PageViewportController.h:
+        (WebKit::PageViewportController::currentContentsScale):
+        * UIProcess/qt/PageViewportControllerClientQt.cpp:
+        * UIProcess/qt/PageViewportControllerClientQt.h:
+        (PageViewportControllerClientQt):
+
 2012-09-10  Simon Hausmann  <simon.hausmann@nokia.com>
 

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

@@ -88 +88 @@
     void setNeedsDisplay();
 
-    WebKit::PageViewportControllerClientQt* pageViewportControllerClient() const { return m_pageViewportControllerClient.data(); }
+    WebKit::PageViewportController* viewportController() const { return m_pageViewportController.data(); }
     virtual void updateViewportSize() { }
     void updateTouchViewportSize();

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

@@ -149 +149 @@
 {
     QJsonObject viewportData;
-    if (const PageViewportControllerClientQt* const viewportHandler = m_webViewPrivate->pageViewportControllerClient()) {
+    if (const PageViewportController* const viewportHandler = m_webViewPrivate->viewportController()) {
         viewportData.insert(QLatin1String("layoutSize"), toJsonObject(viewportHandler->contentsLayoutSize()));
         viewportData.insert(QLatin1String("isScalable"), viewportHandler->allowsUserScaling());
@@ -166 +166 @@
 QVariant QWebKitTest::devicePixelRatio() const
 {
-    if (const PageViewportControllerClientQt* const viewport = m_webViewPrivate->pageViewportControllerClient())
+    if (const PageViewportController* const viewport = m_webViewPrivate->viewportController())
         return viewport->devicePixelRatio();
     return 1.0;
@@ -173 +173 @@
 QVariant QWebKitTest::contentsScale() const
 {
-    if (const PageViewportControllerClientQt* const viewport = m_webViewPrivate->pageViewportControllerClient())
+    if (const PageViewportController* const viewport = m_webViewPrivate->viewportController())
         return viewport->currentContentsScale();
     return 1.0;

trunk/Source/WebKit2/UIProcess/PageViewportController.h

@@ -94 +94 @@
     float minimumContentsScale() const { return m_minimumScale; }
     float maximumContentsScale() const { return m_maximumScale; }
+    float currentContentsScale() const { return convertFromViewport(m_effectiveScale); }
 
     void setHadUserInteraction(bool didUserInteract) { m_hadUserInteraction = didUserInteract; }

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

@@ -351 +351 @@
 }
 
-bool PageViewportControllerClientQt::allowsUserScaling() const
-{
-    return m_controller->allowsUserScaling();
-}
-
-qreal PageViewportControllerClientQt::devicePixelRatio() const
-{
-    return m_controller->devicePixelRatio();
-}
-
-qreal PageViewportControllerClientQt::minimumContentsScale() const
-{
-    return m_controller->minimumContentsScale();
-}
-
-qreal PageViewportControllerClientQt::maximumContentsScale() const
-{
-    return m_controller->maximumContentsScale();
-}
-
-qreal PageViewportControllerClientQt::currentContentsScale() const
-{
-    return m_pageItem->contentsScale();
-}
-
-QSizeF PageViewportControllerClientQt::contentsLayoutSize() const
-{
-    return m_controller->contentsLayoutSize();
-}
-
 bool PageViewportControllerClientQt::scrollAnimationActive() const
 {

trunk/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.h

@@ -121 +121 @@
     QQuickWebPage* const m_pageItem;
 
-    bool allowsUserScaling() const;
-    qreal devicePixelRatio() const;
-    qreal minimumContentsScale() const;
-    qreal maximumContentsScale() const;
-    qreal currentContentsScale() const;
-    QSizeF contentsLayoutSize() const;
-
     float viewportScaleForRect(const QRectF&) const;
     QRectF visibleContentsRect() const;