Title: [128035] trunk/Source/WebKit2
- Revision
- 128035
- Author
- [email protected]
- Date
- 2012-09-10 02:27:02 -0700 (Mon, 10 Sep 2012)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (128034 => 128035)
--- trunk/Source/WebKit2/ChangeLog 2012-09-10 09:16:05 UTC (rev 128034)
+++ trunk/Source/WebKit2/ChangeLog 2012-09-10 09:27:02 UTC (rev 128035)
@@ -1,3 +1,26 @@
+2012-09-10 Andras Becsi <[email protected]>
+
+ [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 <[email protected]>
[WK2] Make WK2 C API headers compile in the Qt build on Windows
Modified: trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p_p.h (128034 => 128035)
--- trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p_p.h 2012-09-10 09:16:05 UTC (rev 128034)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p_p.h 2012-09-10 09:27:02 UTC (rev 128035)
@@ -87,7 +87,7 @@
int loadProgress() const { return m_loadProgress; }
void setNeedsDisplay();
- WebKit::PageViewportControllerClientQt* pageViewportControllerClient() const { return m_pageViewportControllerClient.data(); }
+ WebKit::PageViewportController* viewportController() const { return m_pageViewportController.data(); }
virtual void updateViewportSize() { }
void updateTouchViewportSize();
Modified: trunk/Source/WebKit2/UIProcess/API/qt/qwebkittest.cpp (128034 => 128035)
--- trunk/Source/WebKit2/UIProcess/API/qt/qwebkittest.cpp 2012-09-10 09:16:05 UTC (rev 128034)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qwebkittest.cpp 2012-09-10 09:27:02 UTC (rev 128035)
@@ -148,7 +148,7 @@
QJsonObject QWebKitTest::viewport() const
{
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());
viewportData.insert(QLatin1String("minimumScale"), viewportHandler->minimumContentsScale());
@@ -165,14 +165,14 @@
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;
}
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;
}
Modified: trunk/Source/WebKit2/UIProcess/PageViewportController.h (128034 => 128035)
--- trunk/Source/WebKit2/UIProcess/PageViewportController.h 2012-09-10 09:16:05 UTC (rev 128034)
+++ trunk/Source/WebKit2/UIProcess/PageViewportController.h 2012-09-10 09:27:02 UTC (rev 128035)
@@ -93,6 +93,7 @@
float devicePixelRatio() const { return m_devicePixelRatio; }
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; }
Modified: trunk/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.cpp (128034 => 128035)
--- trunk/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.cpp 2012-09-10 09:16:05 UTC (rev 128034)
+++ trunk/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.cpp 2012-09-10 09:27:02 UTC (rev 128035)
@@ -350,36 +350,6 @@
updateViewportController();
}
-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
{
return m_viewportItem->isFlicking();
Modified: trunk/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.h (128034 => 128035)
--- trunk/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.h 2012-09-10 09:16:05 UTC (rev 128034)
+++ trunk/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.h 2012-09-10 09:27:02 UTC (rev 128035)
@@ -120,13 +120,6 @@
QQuickWebView* const m_viewportItem;
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;
QRectF nearestValidVisibleContentsRect() const;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
