Changeset 155188 in webkit

Timestamp:

Sep 6, 2013 6:33:03 AM (11 years ago)

Author:

Csaba Osztrogonác

Message:

[Qt] REGRESSION(r155140) Pixel tests is still broken on Qt with QT_WEBKIT_DISABLE_UIPROCESS_DUMPPIXELS=1
​https://bugs.webkit.org/show_bug.cgi?id=120847

Patch by Gabor Abraham <​abrhm@inf.u-szeged.hu> on 2013-09-06
Reviewed by Csaba Osztrogonác.

Move the force repaint code back to if (PlatformWebView::windowSnapshotEnabled()) block to support Qt.
Typo fixed: windowShapshotEnabled -> windowSnapshotEnabled.
Add a default PlatformWebView::windowSnapshotEnabled() to the !PLATFORM(QT).

• WebKitTestRunner/PlatformWebView.h:

(WTR::PlatformWebView::windowSnapshotEnabled):

• WebKitTestRunner/TestInvocation.cpp:

(WTR::TestInvocation::dumpResults):

• WebKitTestRunner/qt/PlatformWebViewQt.cpp:

(WTR::WrapperWindow::handleStatusChanged):
(WTR::PlatformWebView::windowSnapshotEnabled):

• WebKitTestRunner/qt/TestInvocationQt.cpp:

(WTR::TestInvocation::dumpPixelsAndCompareWithExpected):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• WebKitTestRunner/PlatformWebView.h (modified) (1 diff)
• WebKitTestRunner/TestInvocation.cpp (modified) (1 diff)
• WebKitTestRunner/qt/PlatformWebViewQt.cpp (modified) (2 diffs)
• WebKitTestRunner/qt/TestInvocationQt.cpp (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2013-09-06  Gabor Abraham  <abrhm@inf.u-szeged.hu>
+
+        [Qt] REGRESSION(r155140) Pixel tests is still broken on Qt with QT_WEBKIT_DISABLE_UIPROCESS_DUMPPIXELS=1
+        https://bugs.webkit.org/show_bug.cgi?id=120847
+
+        Reviewed by Csaba Osztrogonác.
+
+        Move the force repaint code back to if (PlatformWebView::windowSnapshotEnabled()) block to support Qt.
+        Typo fixed: windowShapshotEnabled -> windowSnapshotEnabled.
+        Add a default PlatformWebView::windowSnapshotEnabled() to the !PLATFORM(QT).
+
+        * WebKitTestRunner/PlatformWebView.h:
+        (WTR::PlatformWebView::windowSnapshotEnabled):
+        * WebKitTestRunner/TestInvocation.cpp:
+        (WTR::TestInvocation::dumpResults):
+        * WebKitTestRunner/qt/PlatformWebViewQt.cpp:
+        (WTR::WrapperWindow::handleStatusChanged):
+        (WTR::PlatformWebView::windowSnapshotEnabled):
+        * WebKitTestRunner/qt/TestInvocationQt.cpp:
+        (WTR::TestInvocation::dumpPixelsAndCompareWithExpected):
+
 2013-09-06  Allan Sandfeld Jensen  <allan.jensen@digia.com>
 

trunk/Tools/WebKitTestRunner/PlatformWebView.h

@@ -82 +82 @@
     void postEvent(QEvent*);
     void setModalEventLoop(QEventLoop* eventLoop) { m_modalEventLoop = eventLoop; }
-    static bool windowShapshotEnabled();
+    // Window snapshot can be disabled on Qt with QT_WEBKIT_DISABLE_UIPROCESS_DUMPPIXELS=1 environment variable (necessary for xvfb)
+    static bool windowSnapshotEnabled();
+#else
+    // Window snapshot is always enabled by default on all other platform.
+    static bool windowSnapshotEnabled() { return true; }
 #endif
 

trunk/Tools/WebKitTestRunner/TestInvocation.cpp

@@ -326 +326 @@
 
     if (m_dumpPixels && m_pixelResult) {
-        m_gotRepaint = false;
-        WKPageForceRepaint(TestController::shared().mainWebView()->page(), this, TestInvocation::forceRepaintDoneCallback);
-        TestController::shared().runUntil(m_gotRepaint, TestController::ShortTimeout);
-        if (!m_gotRepaint) {
-            m_errorMessage = "Timed out waiting for pre-pixel dump repaint\n";
-            m_webProcessIsUnresponsive = true;
-            return;
+        if (PlatformWebView::windowSnapshotEnabled()) {
+            m_gotRepaint = false;
+            WKPageForceRepaint(TestController::shared().mainWebView()->page(), this, TestInvocation::forceRepaintDoneCallback);
+            TestController::shared().runUntil(m_gotRepaint, TestController::ShortTimeout);
+            if (!m_gotRepaint) {
+                m_errorMessage = "Timed out waiting for pre-pixel dump repaint\n";
+                m_webProcessIsUnresponsive = true;
+                return;
+            }
         }
         dumpPixelsAndCompareWithExpected(m_pixelResult.get(), m_repaintRects.get());

trunk/Tools/WebKitTestRunner/qt/PlatformWebViewQt.cpp

@@ -66 +66 @@
         QQmlProperty::write(m_view, "anchors.fill", qVariantFromValue(rootObject()));
 
-        if (PlatformWebView::windowShapshotEnabled()) {
+        if (PlatformWebView::windowSnapshotEnabled()) {
             setSurfaceType(OpenGLSurface);
             create();
@@ -176 +176 @@
 }
 
-bool PlatformWebView::windowShapshotEnabled()
+bool PlatformWebView::windowSnapshotEnabled()
 {
     // We need a way to disable UI side rendering for tests because it is

trunk/Tools/WebKitTestRunner/qt/TestInvocationQt.cpp

@@ -68 +68 @@
 {
     QImage image;
-    if (PlatformWebView::windowShapshotEnabled()) {
+    if (PlatformWebView::windowSnapshotEnabled()) {
         image = WKImageCreateQImage(TestController::shared().mainWebView()->windowSnapshotImage().get());
     } else