Commit f6cfb7ae authored by tkent@chromium.org's avatar tkent@chromium.org
Browse files

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.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66860 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 45ed6541
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>
 
Unreviewed. Build fix.
......@@ -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
......
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>
Reviewed by Kent Tamura.
......
......@@ -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.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment