summaryrefslogtreecommitdiff
path: root/Tools/DumpRenderTree
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@digia.com>2012-11-09 09:42:44 +0100
committerSimon Hausmann <simon.hausmann@digia.com>2012-11-09 09:42:44 +0100
commita59391482883479a9b28a6f1ace6d1ebd08a7ecd (patch)
treefa539db054a20a67bff2fc891c33b0f4ec632916 /Tools/DumpRenderTree
parentcfd86b747d32ac22246a1aa908eaa720c63a88c1 (diff)
downloadqtwebkit-a59391482883479a9b28a6f1ace6d1ebd08a7ecd.tar.gz
Imported WebKit commit 7bcdfab9a40db7d16b4b95bb77d78b8a59c9e701 (http://svn.webkit.org/repository/webkit/trunk@134025)
New snapshot with numerious build fixes, including MSVC 2012 and ARM Thumb-2.
Diffstat (limited to 'Tools/DumpRenderTree')
-rw-r--r--Tools/DumpRenderTree/blackberry/DumpRenderTree.cpp5
-rw-r--r--Tools/DumpRenderTree/chromium/TestShell.cpp3
-rw-r--r--Tools/DumpRenderTree/chromium/TestWebPlugin.cpp1
-rwxr-xr-xTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp2
-rw-r--r--Tools/DumpRenderTree/qt/TestRunnerQt.cpp7
-rw-r--r--Tools/DumpRenderTree/qt/TestRunnerQt.h4
6 files changed, 17 insertions, 5 deletions
diff --git a/Tools/DumpRenderTree/blackberry/DumpRenderTree.cpp b/Tools/DumpRenderTree/blackberry/DumpRenderTree.cpp
index a62083fa9..d674ab5e7 100644
--- a/Tools/DumpRenderTree/blackberry/DumpRenderTree.cpp
+++ b/Tools/DumpRenderTree/blackberry/DumpRenderTree.cpp
@@ -59,6 +59,7 @@
#include "WorkQueue.h"
#include "WorkQueueItem.h"
#include <BlackBerryPlatformLayoutTest.h>
+#include <BlackBerryPlatformPrimitives.h>
#include <WebSettings.h>
#include <stdio.h>
#include <sys/stat.h>
@@ -164,7 +165,7 @@ DumpRenderTree::DumpRenderTree(BlackBerry::WebKit::WebPage* page)
m_doneFile = sdcardPath + "/done" + workerNumber;
m_currentTestFile = sdcardPath + "/current" + workerNumber + ".drt";
m_page->resetVirtualViewportOnCommitted(false);
- m_page->setVirtualViewportSize(800, 600);
+ m_page->setVirtualViewportSize(Platform::IntSize(800, 600));
s_currentInstance = this;
}
@@ -292,7 +293,7 @@ void DumpRenderTree::resetToConsistentStateBeforeTesting(const String& url, cons
setAcceptsEditing(true);
DumpRenderTreeSupport::setLinksIncludedInFocusChain(true);
- m_page->setVirtualViewportSize(800, 600);
+ m_page->setVirtualViewportSize(Platform::IntSize(800, 600));
m_page->resetVirtualViewportOnCommitted(false);
m_page->setUserScalable(true);
m_page->setJavaScriptCanAccessClipboard(true);
diff --git a/Tools/DumpRenderTree/chromium/TestShell.cpp b/Tools/DumpRenderTree/chromium/TestShell.cpp
index 4c42dc0dd..2bccb6a32 100644
--- a/Tools/DumpRenderTree/chromium/TestShell.cpp
+++ b/Tools/DumpRenderTree/chromium/TestShell.cpp
@@ -255,8 +255,9 @@ void TestShell::runFileTest(const TestParams& params, bool shouldDumpPixels)
m_testRunner->setShouldDumpFrameLoadCallbacks(true);
if (testUrl.find("compositing/") != string::npos || testUrl.find("compositing\\") != string::npos) {
+ if (!m_softwareCompositingEnabled)
+ m_prefs.accelerated2dCanvasEnabled = true;
m_prefs.acceleratedCompositingForVideoEnabled = true;
- m_prefs.accelerated2dCanvasEnabled = true;
m_prefs.deferred2dCanvasEnabled = true;
m_prefs.mockScrollbarsEnabled = true;
m_prefs.applyTo(m_webView);
diff --git a/Tools/DumpRenderTree/chromium/TestWebPlugin.cpp b/Tools/DumpRenderTree/chromium/TestWebPlugin.cpp
index 414db2c1c..146884613 100644
--- a/Tools/DumpRenderTree/chromium/TestWebPlugin.cpp
+++ b/Tools/DumpRenderTree/chromium/TestWebPlugin.cpp
@@ -459,6 +459,7 @@ bool TestWebPlugin::handleInputEvent(const WebKit::WebInputEvent& event, WebKit:
case WebKit::WebInputEvent::GestureDoubleTap: eventName = "GestureDoubleTap"; break;
case WebKit::WebInputEvent::GestureTwoFingerTap: eventName = "GestureTwoFingerTap"; break;
case WebKit::WebInputEvent::GestureLongPress: eventName = "GestureLongPress"; break;
+ case WebKit::WebInputEvent::GestureLongTap: eventName = "GestureLongTap"; break;
case WebKit::WebInputEvent::GesturePinchBegin: eventName = "GesturePinchBegin"; break;
case WebKit::WebInputEvent::GesturePinchEnd: eventName = "GesturePinchEnd"; break;
case WebKit::WebInputEvent::GesturePinchUpdate: eventName = "GesturePinchUpdate"; break;
diff --git a/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp b/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
index ea114e6e0..34ee5ad4a 100755
--- a/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
+++ b/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
@@ -938,7 +938,7 @@ void DumpRenderTree::dump()
fputs("#EOF\n", stdout);
fputs("#EOF\n", stderr);
- if (m_dumpPixelsForCurrentTest && !m_controller->shouldDumpAsText()) {
+ if (m_dumpPixelsForCurrentTest && m_controller->shouldDumpPixels()) {
QImage image;
if (!m_controller->isPrinting()) {
image = QImage(m_page->viewportSize(), QImage::Format_ARGB32);
diff --git a/Tools/DumpRenderTree/qt/TestRunnerQt.cpp b/Tools/DumpRenderTree/qt/TestRunnerQt.cpp
index 98fa7100b..6067514f0 100644
--- a/Tools/DumpRenderTree/qt/TestRunnerQt.cpp
+++ b/Tools/DumpRenderTree/qt/TestRunnerQt.cpp
@@ -53,6 +53,7 @@ void TestRunner::reset()
m_hasDumped = false;
m_loadFinished = false;
m_textDump = false;
+ m_shouldDumpPixels = true;
m_dumpBackForwardList = false;
m_dumpChildrenAsText = false;
m_dumpChildFrameScrollPositions = false;
@@ -142,6 +143,12 @@ void TestRunner::maybeDump(bool /*success*/)
}
}
+void TestRunner::dumpAsText(bool shouldDumpPixels)
+{
+ m_textDump = true;
+ m_shouldDumpPixels = shouldDumpPixels;
+}
+
void TestRunner::waitUntilDone()
{
//qDebug() << ">>>>waitForDone";
diff --git a/Tools/DumpRenderTree/qt/TestRunnerQt.h b/Tools/DumpRenderTree/qt/TestRunnerQt.h
index e54fde09e..a1c1a481f 100644
--- a/Tools/DumpRenderTree/qt/TestRunnerQt.h
+++ b/Tools/DumpRenderTree/qt/TestRunnerQt.h
@@ -63,6 +63,7 @@ public:
bool shouldDisallowIncreaseForApplicationCacheQuota() const { return m_disallowIncreaseForApplicationCacheQuota; }
bool shouldDumpAsText() const { return m_textDump; }
+ bool shouldDumpPixels() const { return m_shouldDumpPixels; }
bool shouldDumpBackForwardList() const { return m_dumpBackForwardList; }
bool shouldDumpChildrenAsText() const { return m_dumpChildrenAsText; }
bool shouldDumpChildFrameScrollPositions() const { return m_dumpChildFrameScrollPositions; }
@@ -98,7 +99,7 @@ Q_SIGNALS:
public Q_SLOTS:
void maybeDump(bool ok);
void disallowIncreaseForApplicationCacheQuota() { m_disallowIncreaseForApplicationCacheQuota = true; }
- void dumpAsText() { m_textDump = true; }
+ void dumpAsText(bool shouldDumpPixels = false);
void dumpChildFramesAsText() { m_dumpChildrenAsText = true; }
void dumpChildFrameScrollPositions() { m_dumpChildFrameScrollPositions = true; }
void dumpDatabaseCallbacks() { m_dumpDatabaseCallbacks = true; }
@@ -284,6 +285,7 @@ private:
private:
bool m_hasDumped;
bool m_textDump;
+ bool m_shouldDumpPixels;
bool m_disallowIncreaseForApplicationCacheQuota;
bool m_dumpBackForwardList;
bool m_dumpChildrenAsText;