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

[mihaip at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 5fb0c36d8aedd90db14738d6419dd0f0bf4e99b7
Author: mihaip at chromium.org <mihaip at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 22 00:52:10 2010 +0000

    2010-10-21  Mihai Parparita  <mihaip at chromium.org>
    
            Unreviewed fix for rebaseline-chromium-webkit-tests.
    
            Port.diff_image no longer has a tolerance parameter. Also, use
            get_option('tolerance') which is safer if the options object doesn't
            define a tolerance attribute (it doesn't for the one used in
            rebaseline_chromium_webkit_tests).
    
            * Scripts/webkitpy/layout_tests/port/port_testcase.py:
            * Scripts/webkitpy/layout_tests/port/webkit.py:
            * Scripts/webkitpy/layout_tests/rebaseline_chromium_webkit_tests.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70279 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 3ed969e..a1c3037 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,5 +1,18 @@
 2010-10-21  Mihai Parparita  <mihaip at chromium.org>
 
+        Unreviewed fix for rebaseline-chromium-webkit-tests.
+
+        Port.diff_image no longer has a tolerance parameter. Also, use
+        get_option('tolerance') which is safer if the options object doesn't
+        define a tolerance attribute (it doesn't for the one used in
+        rebaseline_chromium_webkit_tests).
+
+        * Scripts/webkitpy/layout_tests/port/port_testcase.py:
+        * Scripts/webkitpy/layout_tests/port/webkit.py:
+        * Scripts/webkitpy/layout_tests/rebaseline_chromium_webkit_tests.py:
+
+2010-10-21  Mihai Parparita  <mihaip at chromium.org>
+
         Reviewed by Ojan Vafai.
 
         Add support for --tolerance in NRWT
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/port/port_testcase.py b/WebKitTools/Scripts/webkitpy/layout_tests/port/port_testcase.py
index 300dbc6..04ada50 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/port/port_testcase.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/port/port_testcase.py
@@ -35,8 +35,7 @@ import unittest
 from webkitpy.tool import mocktool
 mock_options = mocktool.MockOptions(results_directory='layout-test-results',
                                     use_apache=True,
-                                    configuration='Release',
-                                    tolerance=None)
+                                    configuration='Release')
 
 
 class PortTestCase(unittest.TestCase):
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/port/webkit.py b/WebKitTools/Scripts/webkitpy/layout_tests/port/webkit.py
index 24d31a7..0d0d3e0 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/port/webkit.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/port/webkit.py
@@ -137,8 +137,8 @@ class WebKitPort(base.Port):
         # FIXME: use self.get_option('tolerance') and
         # self.set_option_default('tolerance', 0.1) once that behaves correctly
         # with default values.
-        if self._options.tolerance is not None:
-            tolerance = self._options.tolerance
+        if self.get_option('tolerance') is not None:
+            tolerance = self.get_option('tolerance')
         else:
             tolerance = 0.1
         command = [self._path_to_image_diff(), '--tolerance', str(tolerance)]
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/rebaseline_chromium_webkit_tests.py b/WebKitTools/Scripts/webkitpy/layout_tests/rebaseline_chromium_webkit_tests.py
index a47370d..434058e 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/rebaseline_chromium_webkit_tests.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/rebaseline_chromium_webkit_tests.py
@@ -496,7 +496,7 @@ class Rebaseliner(object):
         """
 
         if is_image:
-            return self._port.diff_image(output1, output2, None, 0)
+            return self._port.diff_image(output1, output2, None)
         else:
             return self._port.compare_text(output1, output2)
 

-- 
WebKit Debian packaging