diff options
| author | Konstantin Tokarev <annulen@yandex.ru> | 2017-06-01 15:54:01 +0300 |
|---|---|---|
| committer | Konstantin Tokarev <annulen@yandex.ru> | 2017-06-02 14:07:43 +0000 |
| commit | 0a3506ebe5d7f431f0dd4dffa24ac32063b90ff1 (patch) | |
| tree | f3d0b92fe7bc5b31426a838c354616fff335e82b /Tools/DumpRenderTree | |
| parent | 881da28418d380042aa95a97f0cbd42560a64f7c (diff) | |
| download | qtwebkit-0a3506ebe5d7f431f0dd4dffa24ac32063b90ff1.tar.gz | |
Import WebKit commit 3ca7a25a550e473d60bbbe321475c6c0ef114b31
Change-Id: I480668a0cb8114dccf7a1195190a993282875759
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'Tools/DumpRenderTree')
| -rw-r--r-- | Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp | 3 | ||||
| -rw-r--r-- | Tools/DumpRenderTree/qt/TestRunnerQt.cpp | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp b/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp index e72ee703a..8f1829e3f 100644 --- a/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp +++ b/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp @@ -1019,7 +1019,8 @@ void DumpRenderTree::dump() QImage image; if (!m_jscController->isPrinting()) { - image = QImage(m_page->viewportSize(), QImage::Format_ARGB32); + image = QImage(m_page->viewportSize() * m_page->devicePixelRatio(), QImage::Format_ARGB32); + image.setDevicePixelRatio(m_page->devicePixelRatio()); image.fill(Qt::white); QPainter painter(&image); painter.setRenderHints(renderHints); diff --git a/Tools/DumpRenderTree/qt/TestRunnerQt.cpp b/Tools/DumpRenderTree/qt/TestRunnerQt.cpp index 09f1d09dc..145a4f01a 100644 --- a/Tools/DumpRenderTree/qt/TestRunnerQt.cpp +++ b/Tools/DumpRenderTree/qt/TestRunnerQt.cpp @@ -71,6 +71,8 @@ void TestRunnerQt::reset() m_geolocationPermission = false; m_audioData.clear(); + m_drt->webPage()->setDevicePixelRatio(1); + DumpRenderTreeSupportQt::dumpEditingCallbacks(false); DumpRenderTreeSupportQt::dumpFrameLoader(false); DumpRenderTreeSupportQt::dumpProgressFinishedCallback(false); @@ -869,8 +871,9 @@ void TestRunner::focusWebView() { } -void TestRunner::setBackingScaleFactor(double) +void TestRunner::setBackingScaleFactor(double scale) { + DumpRenderTree::instance()->webPage()->setDevicePixelRatio(scale); } void TestRunner::removeChromeInputField() |