[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[tkent at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit f6cfb7ae300ba652e2cbb1decdbf5f77491b3df8
Author: tkent at chromium.org <tkent at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Sep 7 03:05:41 2010 +0000

    2010-09-06  Kent Tamura  <tkent at 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 at 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.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66860 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 6ecc9f3..b38fbaf 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2010-09-06  Kent Tamura  <tkent at 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 at chromium.org>
 
         Unreviewed. Build fix.
diff --git a/LayoutTests/platform/chromium/drt_expectations.txt b/LayoutTests/platform/chromium/drt_expectations.txt
index ee4bea4..caeef82 100644
--- a/LayoutTests/platform/chromium/drt_expectations.txt
+++ b/LayoutTests/platform/chromium/drt_expectations.txt
@@ -116,7 +116,6 @@ BUG_DRT WIN MAC LINUX : fast/dynamic/window-resize-scrollbars-test.html = IMAGE+
 BUG_DRT WIN : fast/events/show-modal-dialog-onblur-onfocus.html = TEXT
 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
 BUG_DRT LINUX : plugins/embed-attributes-style.html = IMAGE+TEXT
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index f747a0c..c1a0e05 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,13 @@
+2010-09-06  Kent Tamura  <tkent at 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 at chromium.org>
 
         Reviewed by Kent Tamura.
diff --git a/WebKitTools/DumpRenderTree/chromium/TestShell.cpp b/WebKitTools/DumpRenderTree/chromium/TestShell.cpp
index 21a153d..bbaa501 100644
--- a/WebKitTools/DumpRenderTree/chromium/TestShell.cpp
+++ b/WebKitTools/DumpRenderTree/chromium/TestShell.cpp
@@ -493,6 +493,7 @@ void TestShell::dump()
     if (!frame)
         return;
     bool shouldDumpAsText = m_layoutTestController->shouldDumpAsText();
+    bool shouldGeneratePixelResults = m_layoutTestController->shouldGeneratePixelResults();
     bool dumpedAnything = false;
     if (m_params.dumpTree) {
         dumpedAnything = true;
@@ -502,7 +503,10 @@ void TestShell::dump()
         if (!shouldDumpAsText) {
             // 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) {
             bool recursive = m_layoutTestController->shouldDumpChildFramesAsText();
@@ -520,7 +524,7 @@ void TestShell::dump()
     if (dumpedAnything && m_params.printSeparators)
         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
         // stdout.

-- 
WebKit Debian packaging