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

[hayato at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 60b9cae0be6d12403f39d4ac86795eefd7f582cc
Author: hayato at chromium.org <hayato at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 18 19:06:33 2010 +0000

    2010-11-18  Hayato Ito  <hayato at chromium.org>
    
            Reviewed by Shinichiro Hamaji.
    
            [NRWT] Fix a break of '--new-baseline' feature in pixel_test
            which is caused by r72249.
    
            https://bugs.webkit.org/show_bug.cgi?id=49751
    
            * Scripts/webkitpy/layout_tests/test_types/image_diff.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72314 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index d111e7d..10d3ab8 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,14 @@
+2010-11-18  Hayato Ito  <hayato at chromium.org>
+
+        Reviewed by Shinichiro Hamaji.
+
+        [NRWT] Fix a break of '--new-baseline' feature in pixel_test
+        which is caused by r72249.
+
+        https://bugs.webkit.org/show_bug.cgi?id=49751
+
+        * Scripts/webkitpy/layout_tests/test_types/image_diff.py:
+
 2010-11-18  Adam Roben  <aroben at apple.com>
 
         Implement layoutTestController.waitForPolicyDelegate on Windows
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/test_types/image_diff.py b/WebKitTools/Scripts/webkitpy/layout_tests/test_types/image_diff.py
index 41fe9bd..da466c8 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/test_types/image_diff.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/test_types/image_diff.py
@@ -103,8 +103,8 @@ class ImageDiff(test_type_base.TestTypeBase):
 
         # If we're generating a new baseline, we pass.
         if test_args.new_baseline or test_args.reset_results:
-            self._save_baseline_files(filename, actual_test_output.image_hash,
-                                      actual_test_output.image,
+            self._save_baseline_files(filename, actual_test_output.image,
+                                      actual_test_output.image_hash,
                                       test_args.new_baseline)
             return failures
 

-- 
WebKit Debian packaging