Revert "Imported WebKit commit 0dc6cd75e1d4836eaffbb520be96fac4847cc9d2 (http://svn.webkit.org/repository/webkit/trunk@131300)"

This reverts commit 5466563f4b5b6b86523e3f89bb7f77e5b5270c78.

Caused OOM issues on some CI machines :(

1 files changed, 3 insertions, 19 deletions

diff --git a/Tools/WebKitTestRunner/qt/TestInvocationQt.cpp b/Tools/WebKitTestRunner/qt/TestInvocationQt.cpp
index 981c2032a..01630d98a 100644
--- a/Tools/WebKitTestRunner/qt/TestInvocationQt.cpp
+++ b/Tools/WebKitTestRunner/qt/TestInvocationQt.cpp
@@ -29,7 +29,6 @@
 
 #include <QBuffer>
 #include <QCryptographicHash>
-#include <QtGui/QPainter>
 #include <WebKit2/WKImageQt.h>
 #include <stdio.h>
 #include <wtf/Assertions.h>
@@ -65,25 +64,10 @@ static void dumpImage(const QImage& image)
 
 void TestInvocation::dumpPixelsAndCompareWithExpected(WKImageRef imageRef, WKArrayRef repaintRects)
 {
-    QImage image = WKImageCreateQImage(imageRef);
-
-    if (repaintRects) {
-        QImage mask(image.size(), image.format());
-        mask.fill(QColor(0, 0, 0, 0.66 * 255));
-
-        QPainter maskPainter(&mask);
-        maskPainter.setCompositionMode(QPainter::CompositionMode_Source);
-        size_t count = WKArrayGetSize(repaintRects);
-        for (size_t i = 0; i < count; ++i) {
-            WKRect wkRect = WKRectGetValue(static_cast<WKRectRef>(WKArrayGetItemAtIndex(repaintRects, i)));
-            QRectF rect(wkRect.origin.x, wkRect.origin.y, wkRect.size.width, wkRect.size.height);
-            maskPainter.fillRect(rect, Qt::transparent);
-        }
-
-        QPainter painter(&image);
-        painter.drawImage(image.rect(), mask);
-    }
+    //FIXME: https://bugs.webkit.org/show_bug.cgi?id=68870
+    UNUSED_PARAM(repaintRects);
 
+    QImage image = WKImageCreateQImage(imageRef);
     QCryptographicHash hash(QCryptographicHash::Md5);
     for (unsigned row = 0; row < image.height(); ++row)
         hash.addData(reinterpret_cast<const char*>(image.constScanLine(row)), image.bytesPerLine());