diff options
author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2013-09-13 12:51:20 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-19 20:50:05 +0200 |
commit | d441d6f39bb846989d95bcf5caf387b42414718d (patch) | |
tree | e367e64a75991c554930278175d403c072de6bb8 /Source/WebKit2/UIProcess/API/qt/qwebkittest.cpp | |
parent | 0060b2994c07842f4c59de64b5e3e430525c4b90 (diff) | |
download | qtwebkit-d441d6f39bb846989d95bcf5caf387b42414718d.tar.gz |
Import Qt5x2 branch of QtWebkit for Qt 5.2
Importing a new snapshot of webkit.
Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
Diffstat (limited to 'Source/WebKit2/UIProcess/API/qt/qwebkittest.cpp')
-rw-r--r-- | Source/WebKit2/UIProcess/API/qt/qwebkittest.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/WebKit2/UIProcess/API/qt/qwebkittest.cpp b/Source/WebKit2/UIProcess/API/qt/qwebkittest.cpp index a8a9c686b..20cfa388d 100644 --- a/Source/WebKit2/UIProcess/API/qt/qwebkittest.cpp +++ b/Source/WebKit2/UIProcess/API/qt/qwebkittest.cpp @@ -151,8 +151,8 @@ QJsonObject QWebKitTest::viewport() const 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()); - viewportData.insert(QLatin1String("maximumScale"), viewportHandler->maximumContentsScale()); + viewportData.insert(QLatin1String("minimumScale"), viewportHandler->minimumScale()); + viewportData.insert(QLatin1String("maximumScale"), viewportHandler->maximumScale()); } else { viewportData.insert(QLatin1String("initialScale"), 1.0); viewportData.insert(QLatin1String("layoutSize"), toJsonObject(QSizeF())); @@ -166,13 +166,13 @@ QJsonObject QWebKitTest::viewport() const QVariant QWebKitTest::devicePixelRatio() const { if (const PageViewportController* const viewport = m_webViewPrivate->viewportController()) - return viewport->devicePixelRatio(); + return viewport->deviceScaleFactor(); return 1.0; } QVariant QWebKitTest::contentsScale() const { if (const PageViewportController* const viewport = m_webViewPrivate->viewportController()) - return viewport->currentContentsScale(); + return viewport->currentScale(); return 1.0; } |