summaryrefslogtreecommitdiff
path: root/Tools/WebKitTestRunner/qt/TestInvocationQt.cpp
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/WebKitTestRunner/qt/TestInvocationQt.cpp
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/WebKitTestRunner/qt/TestInvocationQt.cpp')
-rw-r--r--Tools/WebKitTestRunner/qt/TestInvocationQt.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/Tools/WebKitTestRunner/qt/TestInvocationQt.cpp b/Tools/WebKitTestRunner/qt/TestInvocationQt.cpp
index 0c231508e..682a6377f 100644
--- a/Tools/WebKitTestRunner/qt/TestInvocationQt.cpp
+++ b/Tools/WebKitTestRunner/qt/TestInvocationQt.cpp
@@ -83,10 +83,10 @@ void TestInvocation::dumpPixelsAndCompareWithExpected(WKImageRef imageRef, WKArr
if (m_gotRepaint)
image = WKImageCreateQImage(TestController::shared().mainWebView()->windowSnapshotImage().get());
else {
- // The test harness expects an image so we output an empty one.
- WKRect windowRect = TestController::shared().mainWebView()->windowFrame();
- image = QImage(QSize(windowRect.size.width, windowRect.size.height), QImage::Format_ARGB32_Premultiplied);
- image.fill(Qt::red);
+ m_error = true;
+ m_errorMessage = "Timed out waiting for repaint\n";
+ m_webProcessIsUnrensponsive = true;
+ return;
}
} else
image = WKImageCreateQImage(imageRef);