Imported QtWebKit TP3 (git b57bc6801f1876c3220d5a4bfea33d620d477443)

Change-Id: I3b1d8a2808782c9f34d50240000e20cb38d3680f
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>

1 files changed, 2 insertions, 20 deletions

diff --git a/Tools/WebKitTestRunner/qt/TestInvocationQt.cpp b/Tools/WebKitTestRunner/qt/TestInvocationQt.cpp
index aac846f8d..ac6aaf1ec 100644
--- a/Tools/WebKitTestRunner/qt/TestInvocationQt.cpp
+++ b/Tools/WebKitTestRunner/qt/TestInvocationQt.cpp
@@ -64,29 +64,11 @@ static void dumpImage(const QImage& image)
     fflush(stdout);
 }
 
-void TestInvocation::forceRepaintDoneCallback(WKErrorRef, void *context)
-{
-    static_cast<TestInvocation*>(context)->m_gotRepaint = true;
-    TestController::shared().notifyDone();
-}
-
 void TestInvocation::dumpPixelsAndCompareWithExpected(WKImageRef imageRef, WKArrayRef repaintRects)
 {
     QImage image;
-    if (PlatformWebView::windowShapshotEnabled()) {
-        WKPageRef page = TestController::shared().mainWebView()->page();
-        WKPageForceRepaint(page, this, &forceRepaintDoneCallback);
-
-        TestController::shared().runUntil(m_gotRepaint, TestController::ShortTimeout);
-
-        if (m_gotRepaint)
-            image = WKImageCreateQImage(TestController::shared().mainWebView()->windowSnapshotImage().get());
-        else {
-            m_error = true;
-            m_errorMessage = "Timed out waiting for repaint\n";
-            m_webProcessIsUnresponsive = true;
-            return;
-        }
+    if (PlatformWebView::windowSnapshotEnabled()) {
+        image = WKImageCreateQImage(TestController::shared().mainWebView()->windowSnapshotImage().get());
     } else
         image = WKImageCreateQImage(imageRef);