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

[xji at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit a28cc46eec48bdfaf4f34c4e817c6d5194154661
Author: xji at chromium.org <xji at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 30 20:27:06 2010 +0000

    2010-11-30  Xiaomei Ji  <xji at chromium.org>
    
            Reviewed by David Hyatt.
    
            Scroll position might not be exactly the same after page ZoomIn and ZoomOut, for example, they are not exactly the same in Windows platform.
            Change to test that the scroll position before and after ZoomIn/Out are close enough.
            Rebaseline horizontal-scrollbar-when-dir-change in Win7.
    
            * fast/dom/horizontal-scrollbar-in-rtl.html:
            * platform/win/fast/dom/horizontal-scrollbar-when-dir-change-expected.txt:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72952 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index c1186ad..65089f8 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2010-11-30  Xiaomei Ji  <xji at chromium.org>
+
+        Reviewed by David Hyatt.
+
+        Scroll position might not be exactly the same after page ZoomIn and ZoomOut, for example, they are not exactly the same in Windows platform.
+        Change to test that the scroll position before and after ZoomIn/Out are close enough.
+        Rebaseline horizontal-scrollbar-when-dir-change in Win7.
+
+        * fast/dom/horizontal-scrollbar-in-rtl.html:
+        * platform/win/fast/dom/horizontal-scrollbar-when-dir-change-expected.txt:
+
 2010-11-30  Ojan Vafai  <ojan at chromium.org>
 
         [chromium] New expected result after http://trac.webkit.org/changeset/72926/.
diff --git a/LayoutTests/fast/dom/horizontal-scrollbar-in-rtl.html b/LayoutTests/fast/dom/horizontal-scrollbar-in-rtl.html
index bdd1281..2008ad3 100644
--- a/LayoutTests/fast/dom/horizontal-scrollbar-in-rtl.html
+++ b/LayoutTests/fast/dom/horizontal-scrollbar-in-rtl.html
@@ -17,12 +17,13 @@
                     log("\n" + message + ": Success");
             }
             
-            function assertTrue(message, fact)
+            function assertClose(message, actual, expected)
             {
-                if (fact)
-                    log("\n" + message + ": Failure");
-                else
+                if ((actual >= expected && actual - expected < 5) ||
+                    (expected >= actual && expected - actual < 5))
                     log("\n" + message + ": Success");
+                else
+                    log("\n" + message + ": Failure, actual: " + actual + "; expected: " + expected);
             }
             
             var expectedScrollX = -1000;
@@ -53,7 +54,7 @@
                     window.scrollTo(expectedScrollX, expectedScrollY);
                     eventSender.zoomPageIn();
                     eventSender.zoomPageOut();
-                    assertEqual("zoom in and out preserve scroll position", window.scrollX,expectedScrollX);
+                    assertClose("zoom in and out preserve scroll position", window.scrollX,expectedScrollX);
                 }
                
                 // Test resize wont reset scroll position.
diff --git a/LayoutTests/platform/win/fast/dom/horizontal-scrollbar-when-dir-change-expected.txt b/LayoutTests/platform/win/fast/dom/horizontal-scrollbar-when-dir-change-expected.txt
index d2f6681..b194543 100644
--- a/LayoutTests/platform/win/fast/dom/horizontal-scrollbar-when-dir-change-expected.txt
+++ b/LayoutTests/platform/win/fast/dom/horizontal-scrollbar-when-dir-change-expected.txt
@@ -2,3 +2,5 @@ original scroll x for RTL page : Success
 horizontal scroll x for RTL page : Success
 original scroll x for LTR page : Success
 horizontal scroll x for LTR page : Success
+
+

-- 
WebKit Debian packaging