Changeset 114875 in webkit

Timestamp:

Apr 23, 2012 12:10:29 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[Qt] Make DRT not dump pixel results if test is calling layoutTestController.dumpAsText()
​https://bugs.webkit.org/show_bug.cgi?id=84327

Patch by Milian Wolff <​mail@milianw.de> on 2012-04-23
Reviewed by Csaba Osztrogonác.

• DumpRenderTree/qt/DumpRenderTreeQt.cpp:

(WebCore::DumpRenderTree::dump):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• DumpRenderTree/qt/DumpRenderTreeQt.cpp (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2012-04-23  Milian Wolff  <mail@milianw.de>
+
+        [Qt] Make DRT not dump pixel results if test is calling layoutTestController.dumpAsText()
+        https://bugs.webkit.org/show_bug.cgi?id=84327
+
+        Reviewed by Csaba Osztrogonác.
+
+        * DumpRenderTree/qt/DumpRenderTreeQt.cpp:
+        (WebCore::DumpRenderTree::dump):
+
 2012-04-22  Sriram Neelakandan  <sriram.neelakandan@gmail.com>
 

trunk/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp

@@ -949 +949 @@
     fputs("#EOF\n", stderr);
 
-    // FIXME: All other ports don't dump pixels, if generatePixelResults is false.
-    if (m_dumpPixels) {
+    if (m_dumpPixels && !m_controller->shouldDumpAsText()) {
         QImage image(m_page->viewportSize(), QImage::Format_ARGB32);
         image.fill(Qt::white);