diff options
| author | Konstantin Tokarev <annulen@yandex.ru> | 2017-04-24 22:40:03 +0300 |
|---|---|---|
| committer | Konstantin Tokarev <annulen@yandex.ru> | 2017-04-25 18:29:55 +0000 |
| commit | 4bd713d56aa9bb86bc96ea9cb0c64cbf94bf43d4 (patch) | |
| tree | 02bd448d49627f059df0d8036fbdb9d9ee883a50 /Source/WebKit2/UIProcess/API/qt/qwebkittest.cpp | |
| parent | bd3f57b00bee3088971209a0ebc513eb1ef4ba14 (diff) | |
| download | qtwebkit-4bd713d56aa9bb86bc96ea9cb0c64cbf94bf43d4.tar.gz | |
Import WebKit commit 3040e0455efecd271f1aeef53cf287e75486a70d
Change-Id: I7df106cef8ce93ce33e49ad6fb0d202cd066d87c
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Diffstat (limited to 'Source/WebKit2/UIProcess/API/qt/qwebkittest.cpp')
| -rw-r--r-- | Source/WebKit2/UIProcess/API/qt/qwebkittest.cpp | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/Source/WebKit2/UIProcess/API/qt/qwebkittest.cpp b/Source/WebKit2/UIProcess/API/qt/qwebkittest.cpp index 20cfa388d..2909124da 100644 --- a/Source/WebKit2/UIProcess/API/qt/qwebkittest.cpp +++ b/Source/WebKit2/UIProcess/API/qt/qwebkittest.cpp @@ -140,8 +140,8 @@ QSize QWebKitTest::contentsSize() const static inline QJsonObject toJsonObject(const QSizeF& sizeF) { QJsonObject result; - result.insert(QLatin1String("width"), sizeF.width()); - result.insert(QLatin1String("height"), sizeF.height()); + result.insert(QStringLiteral("width"), sizeF.width()); + result.insert(QStringLiteral("height"), sizeF.height()); return result; } @@ -149,16 +149,16 @@ QJsonObject QWebKitTest::viewport() const { QJsonObject viewportData; 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->minimumScale()); - viewportData.insert(QLatin1String("maximumScale"), viewportHandler->maximumScale()); + viewportData.insert(QStringLiteral("layoutSize"), toJsonObject(viewportHandler->contentsLayoutSize())); + viewportData.insert(QStringLiteral("isScalable"), viewportHandler->allowsUserScaling()); + viewportData.insert(QStringLiteral("minimumScale"), viewportHandler->minimumScale()); + viewportData.insert(QStringLiteral("maximumScale"), viewportHandler->maximumScale()); } else { - viewportData.insert(QLatin1String("initialScale"), 1.0); - viewportData.insert(QLatin1String("layoutSize"), toJsonObject(QSizeF())); - viewportData.insert(QLatin1String("isScalable"), false); - viewportData.insert(QLatin1String("minimumScale"), 1.0); - viewportData.insert(QLatin1String("maximumScale"), 1.0); + viewportData.insert(QStringLiteral("initialScale"), 1.0); + viewportData.insert(QStringLiteral("layoutSize"), toJsonObject(QSizeF())); + viewportData.insert(QStringLiteral("isScalable"), false); + viewportData.insert(QStringLiteral("minimumScale"), 1.0); + viewportData.insert(QStringLiteral("maximumScale"), 1.0); } return viewportData; } @@ -176,3 +176,5 @@ QVariant QWebKitTest::contentsScale() const return viewport->currentScale(); return 1.0; } + +#include "moc_qwebkittest_p.cpp" |