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

xji at chromium.org xji at chromium.org
Wed Dec 22 17:48:22 UTC 2010


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

    2010-11-30  Xiaomei Ji  <xji at chromium.org>
    
            Reviewed by David Hyatt.
    
            Remove clampNegativeToZero in adjustScrollPositionWithinRange.
            https://bugs.webkit.org/show_bug.cgi?id=50203
    
            * platform/ScrollView.cpp:
            (WebCore::ScrollView::adjustScrollPositionWithinRange):
    2010-11-30  Xiaomei Ji  <xji at chromium.org>
    
            Reviewed by David Hyatt.
    
            Unskip fast/dom/horizontal-scrollbar-in-rtl.html and fast/dom/horizontal-scrollbar-when-dir-change.html in Chromium and Win7.
            Rebaseline after r72852.
            https://bugs.webkit.org/show_bug.cgi?id=50203
    
            * platform/chromium/test_expectations.txt:
            * platform/win/Skipped:
            * platform/win/fast/dom/horizontal-scrollbar-in-rtl-expected.txt: Added.
            * platform/win/fast/dom/horizontal-scrollbar-when-dir-change-expected.txt: Added.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72931 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 6174b00..6f150a6 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+2010-11-30  Xiaomei Ji  <xji at chromium.org>
+
+        Reviewed by David Hyatt.
+
+        Unskip fast/dom/horizontal-scrollbar-in-rtl.html and fast/dom/horizontal-scrollbar-when-dir-change.html in Chromium and Win7.
+        Rebaseline after r72852.
+        https://bugs.webkit.org/show_bug.cgi?id=50203
+
+        * platform/chromium/test_expectations.txt:
+        * platform/win/Skipped:
+        * platform/win/fast/dom/horizontal-scrollbar-in-rtl-expected.txt: Added.
+        * platform/win/fast/dom/horizontal-scrollbar-when-dir-change-expected.txt: Added.
+
 2010-11-30  Adam Roben  <aroben at apple.com>
 
         Try to fix timing-out tests on WebKit2 by skipping an earlier test
diff --git a/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt
index 5bfe2c1..b45c4c0 100644
--- a/LayoutTests/platform/chromium/test_expectations.txt
+++ b/LayoutTests/platform/chromium/test_expectations.txt
@@ -3187,10 +3187,6 @@ BUGCR64695 : fast/dom/StyleSheet/gc-parent-rule.html = TEXT
 BUGCR64695 : fast/dom/StyleSheet/gc-parent-stylesheet.html = CRASH
 BUGCR64695 : fast/dom/StyleSheet/gc-declaration-parent-rule.html = TEXT
 
-// Temporary skipped
-BUG50203 SKIP : fast/dom/horizontal-scrollbar-in-rtl.html = FAIL
-BUG50203 SKIP : fast/dom/horizontal-scrollbar-when-dir-change.html = FAIL
-
 BUGWK50204 : editing/selection/click-left-of-rtl-wrapping-text.html = TEXT
 BUGWK50204 WIN LINUX : editing/selection/modify-up-on-rtl-wrapping-text.html = TEXT
 
diff --git a/LayoutTests/platform/win/Skipped b/LayoutTests/platform/win/Skipped
index fe56a11..f4f413a 100644
--- a/LayoutTests/platform/win/Skipped
+++ b/LayoutTests/platform/win/Skipped
@@ -1069,10 +1069,6 @@ plugins/iframe-shims.html
 # Requires WebP support.
 fast/images/webp-image-decoding.html
 
-#temporary skipped due to bug 50203.
-fast/dom/horizontal-scrollbar-in-rtl.html
-fast/dom/horizontal-scrollbar-when-dir-change.html
-
 # REGRESSION(r72861): editing/selection/click-left-of-rtl-wrapping-text.html and modify-up-on-rtl-wrapping-text.html fail on all but Mac platform
 # https://bugs.webkit.org/show_bug.cgi?id=50204
 editing/selection/click-left-of-rtl-wrapping-text.html
diff --git a/LayoutTests/platform/chromium/fast/dom/horizontal-scrollbar-in-rtl-expected.txt b/LayoutTests/platform/win/fast/dom/horizontal-scrollbar-in-rtl-expected.txt
similarity index 100%
copy from LayoutTests/platform/chromium/fast/dom/horizontal-scrollbar-in-rtl-expected.txt
copy to LayoutTests/platform/win/fast/dom/horizontal-scrollbar-in-rtl-expected.txt
diff --git a/LayoutTests/platform/chromium/fast/dom/horizontal-scrollbar-when-dir-change-expected.txt b/LayoutTests/platform/win/fast/dom/horizontal-scrollbar-when-dir-change-expected.txt
similarity index 100%
copy from LayoutTests/platform/chromium/fast/dom/horizontal-scrollbar-when-dir-change-expected.txt
copy to LayoutTests/platform/win/fast/dom/horizontal-scrollbar-when-dir-change-expected.txt
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 1d60395..07a3017 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-11-30  Xiaomei Ji  <xji at chromium.org>
+
+        Reviewed by David Hyatt.
+
+        Remove clampNegativeToZero in adjustScrollPositionWithinRange.
+        https://bugs.webkit.org/show_bug.cgi?id=50203
+
+        * platform/ScrollView.cpp:
+        (WebCore::ScrollView::adjustScrollPositionWithinRange):
+
 2010-11-30  Adam Roben  <aroben at apple.com>
 
         Remove duplicate files from WebCore.vcproj
diff --git a/WebCore/platform/ScrollView.cpp b/WebCore/platform/ScrollView.cpp
index defd8d3..70e1772 100644
--- a/WebCore/platform/ScrollView.cpp
+++ b/WebCore/platform/ScrollView.cpp
@@ -293,7 +293,6 @@ IntPoint ScrollView::adjustScrollPositionWithinRange(const IntPoint& scrollPoint
 {
     IntPoint newScrollPosition = scrollPoint.shrunkTo(maximumScrollPosition());
     newScrollPosition = newScrollPosition.expandedTo(minimumScrollPosition());
-    newScrollPosition.clampNegativeToZero();
     return newScrollPosition;
 }
 

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list