[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

Sun Feb 20 23:52:22 UTC 2011

The following commit has been merged in the webkit-1.3 branch:
commit 8ddf42829de7a67525b3baa70c7ebeb42c3190bd
Author: weinig at apple.com <weinig at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 26 05:02:13 2011 +0000

    Scrollbars don't work correctly for top-to-bottom text in an overflow: scroll area
    https://bugs.webkit.org/show_bug.cgi?id=53048
    
    Reviewed by David Hyatt.
    
    Source/WebCore:
    
    Test: fast/overflow/overflow-rtl-vertical-origin.html
    
    * rendering/RenderLayer.cpp:
    (WebCore::RenderLayer::scrollPosition):
    (WebCore::RenderLayer::updateScrollInfoAfterLayout):
    Take the scroll origin into account when calculating scrollbars in more places.
    
    LayoutTests:
    
    * fast/overflow/overflow-rtl-vertical-origin-expected.txt: Added.
    * fast/overflow/overflow-rtl-vertical-origin.html: Added.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76669 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 1caaf93..0c24ef1 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2011-01-25  Sam Weinig  <sam at webkit.org>
+
+        Reviewed by David Hyatt.
+
+        Scrollbars don't work correctly for top-to-bottom text in an overflow: scroll area
+        https://bugs.webkit.org/show_bug.cgi?id=53048
+
+        * fast/overflow/overflow-rtl-vertical-origin-expected.txt: Added.
+        * fast/overflow/overflow-rtl-vertical-origin.html: Added.
+
 2011-01-25  Kent Tamura  <tkent at chromium.org>
 
         Unreviewed, test expectation update.
diff --git a/LayoutTests/fast/overflow/overflow-rtl-vertical-origin-expected.txt b/LayoutTests/fast/overflow/overflow-rtl-vertical-origin-expected.txt
new file mode 100644
index 0000000..3b5cd54
--- /dev/null
+++ b/LayoutTests/fast/overflow/overflow-rtl-vertical-origin-expected.txt
@@ -0,0 +1,4 @@
+This tests that the scroll origin for boxes with -webkit-writing-mode:vertical-rl; direction:rtl; overflow:scroll is correct.
+
+PASS: test.scrollTop is correct.
+
diff --git a/LayoutTests/fast/overflow/overflow-rtl-vertical-origin.html b/LayoutTests/fast/overflow/overflow-rtl-vertical-origin.html
new file mode 100644
index 0000000..478ac0e
--- /dev/null
+++ b/LayoutTests/fast/overflow/overflow-rtl-vertical-origin.html
@@ -0,0 +1,23 @@
+<body>
+    <p>This tests that the scroll origin for boxes with -webkit-writing-mode:vertical-rl; direction:rtl; overflow:scroll is correct.</p>
+    <div id="test" style="-webkit-writing-mode:vertical-rl; direction:rtl; overflow:scroll; width: 200px; height: 200px">
+        <div style="height: 300px; width: 100px;"></div>
+    </div>
+    <pre id="console"></pre>
+    
+    <script>
+        function log(msg)
+        {
+            document.getElementById('console').appendChild(document.createTextNode(msg + "\n"));
+        }
+
+        if (window.layoutTestController)
+            layoutTestController.dumpAsText();
+
+        var t = document.getElementById("test");
+        if (t.scrollTop == 115)
+            log("PASS: test.scrollTop is correct.")
+        else
+            log("FAIL: test.scrollTop is incorrect. It is " + t.scrollTop + " but should be 115.");
+    </script>
+</body>
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 03ced13..186a1c4 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2011-01-25  Sam Weinig  <sam at webkit.org>
+
+        Reviewed by David Hyatt.
+
+        Scrollbars don't work correctly for top-to-bottom text in an overflow: scroll area
+        https://bugs.webkit.org/show_bug.cgi?id=53048
+
+        Test: fast/overflow/overflow-rtl-vertical-origin.html
+
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::scrollPosition):
+        (WebCore::RenderLayer::updateScrollInfoAfterLayout):
+        Take the scroll origin into account when calculating scrollbars in more places.
+
 2011-01-25  Steve Falkenburg  <sfalken at apple.com>
 
         Windows production build fix.
diff --git a/Source/WebCore/rendering/RenderLayer.cpp b/Source/WebCore/rendering/RenderLayer.cpp
index ac07296..c9ec87b 100644
--- a/Source/WebCore/rendering/RenderLayer.cpp
+++ b/Source/WebCore/rendering/RenderLayer.cpp
@@ -1665,7 +1665,7 @@ int RenderLayer::scrollPosition(Scrollbar* scrollbar) const
     if (scrollbar->orientation() == HorizontalScrollbar)
         return scrollXOffset();
     if (scrollbar->orientation() == VerticalScrollbar)
-        return m_scrollY;
+        return scrollYOffset();
     return 0;
 }
 
@@ -2033,8 +2033,8 @@ void RenderLayer::updateScrollInfoAfterLayout()
         // Layout may cause us to be in an invalid scroll position.  In this case we need
         // to pull our scroll offsets back to the max (or push them up to the min).
         int newX = max(0, min(scrollXOffset(), scrollWidth() - box->clientWidth()));
-        int newY = max(0, min(m_scrollY, scrollHeight() - box->clientHeight()));
-        if (newX != scrollXOffset() || newY != m_scrollY) {
+        int newY = max(0, min(scrollYOffset(), scrollHeight() - box->clientHeight()));
+        if (newX != scrollXOffset() || newY != scrollYOffset()) {
             RenderView* view = renderer()->view();
             ASSERT(view);
             // scrollToOffset() may call updateLayerPositions(), which doesn't work

-- 
WebKit Debian packaging

