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

[tony at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit ad031d3cd48b0a039f9675d1ba4f27c323663d30
Author: tony at chromium.org <tony at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jul 21 01:29:11 2010 +0000

    2010-07-20  Tony Chang  <tony at chromium.org>
    
            Reviewed by Kent Tamura.
    
            [chromium] by default, dumpAsText should disable pixel results
            https://bugs.webkit.org/show_bug.cgi?id=42715
    
            * DumpRenderTree/chromium/LayoutTestController.cpp:
            (LayoutTestController::dumpAsText): disable pixel results, but allow JS to override
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63796 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 00d3456..4eb4c7c 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,13 @@
+2010-07-20  Tony Chang  <tony at chromium.org>
+
+        Reviewed by Kent Tamura.
+
+        [chromium] by default, dumpAsText should disable pixel results
+        https://bugs.webkit.org/show_bug.cgi?id=42715
+
+        * DumpRenderTree/chromium/LayoutTestController.cpp:
+        (LayoutTestController::dumpAsText): disable pixel results, but allow JS to override
+
 2010-07-20  Adam Roben  <aroben at apple.com>
 
         Windows build fix
diff --git a/WebKitTools/DumpRenderTree/chromium/LayoutTestController.cpp b/WebKitTools/DumpRenderTree/chromium/LayoutTestController.cpp
index 0a06c19..ea1fd01 100644
--- a/WebKitTools/DumpRenderTree/chromium/LayoutTestController.cpp
+++ b/WebKitTools/DumpRenderTree/chromium/LayoutTestController.cpp
@@ -233,6 +233,7 @@ void LayoutTestController::WorkQueue::addWork(WorkItem* work)
 void LayoutTestController::dumpAsText(const CppArgumentList& arguments, CppVariant* result)
 {
     m_dumpAsText = true;
+    m_generatePixelResults = false;
 
     // Optional paramater, describing whether it's allowed to dump pixel results in dumpAsText mode.
     if (arguments.size() > 0 && arguments[0].isBool())

-- 
WebKit Debian packaging