Changeset 66860 in webkit

Timestamp:

Sep 6, 2010 8:05:41 PM (14 years ago)

Author:

tkent@chromium.org

Message:

2010-09-06 Kent Tamura <​tkent@chromium.org>

Reviewed by Dimitri Glazkov.

[DRT/Chromium] Do not generate pixel results for text/plain resources
​https://bugs.webkit.org/show_bug.cgi?id=45253

• platform/chromium/drt_expectations.txt: Remove slow-utf8-text.pl failure.

2010-09-06 Kent Tamura <​tkent@chromium.org>

Reviewed by Dimitri Glazkov.

[DRT/Chromium] Do not generate pixel results for text/plain resources
​https://bugs.webkit.org/show_bug.cgi?id=45253

• DumpRenderTree/chromium/TestShell.cpp: (TestShell::dump): Clear shouldGeneratePixelResults flag for text/plain.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/chromium/drt_expectations.txt (modified) (1 diff)
• WebKitTools/ChangeLog (modified) (1 diff)
• WebKitTools/DumpRenderTree/chromium/TestShell.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-09-06  Kent Tamura  <tkent@chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        [DRT/Chromium] Do not generate pixel results for text/plain resources
+        https://bugs.webkit.org/show_bug.cgi?id=45253
+
+        * platform/chromium/drt_expectations.txt: Remove slow-utf8-text.pl failure.
+
 2010-09-06  Justin Schuh  <jschuh@chromium.org>
 

trunk/LayoutTests/platform/chromium/drt_expectations.txt

@@ -117 +117 @@
 BUG_DRT WIN : fast/harness/show-modal-dialog.html = TEXT
 BUG_DRT WIN : fast/text/stripNullFromText.html = IMAGE+TEXT
-BUG_DRT WIN MAC LINUX : http/tests/incremental/slow-utf8-text.pl = MISSING
 BUG_DRT WIN : plugins/embed-attributes-setting.html = TEXT
 BUG_DRT WIN : plugins/embed-attributes-style.html = IMAGE

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-09-06  Kent Tamura  <tkent@chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        [DRT/Chromium] Do not generate pixel results for text/plain resources
+        https://bugs.webkit.org/show_bug.cgi?id=45253
+
+        * DumpRenderTree/chromium/TestShell.cpp:
+        (TestShell::dump): Clear shouldGeneratePixelResults flag for text/plain.
+
 2010-09-06  Ojan Vafai  <ojan@chromium.org>
 

trunk/WebKitTools/DumpRenderTree/chromium/TestShell.cpp

@@ -494 +494 @@
         return;
     bool shouldDumpAsText = m_layoutTestController->shouldDumpAsText();
+    bool shouldGeneratePixelResults = m_layoutTestController->shouldGeneratePixelResults();
     bool dumpedAnything = false;
     if (m_params.dumpTree) {
@@ -503 +504 @@
             // Plain text pages should be dumped as text
             string mimeType = frame->dataSource()->response().mimeType().utf8();
-            shouldDumpAsText = mimeType == "text/plain";
+            if (mimeType == "text/plain") {
+                shouldDumpAsText = true;
+                shouldGeneratePixelResults = false;
+            }
         }
         if (shouldDumpAsText) {
@@ -521 +525 @@
         m_printer->handleTextFooter();
 
-    if (m_params.dumpPixels && m_layoutTestController->shouldGeneratePixelResults()) {
+    if (m_params.dumpPixels && shouldGeneratePixelResults) {
         // Image output: we write the image data to the file given on the
         // command line (for the dump pixels argument), and the MD5 sum to