Changeset 11521 in webkit

Timestamp:

Dec 10, 2005 12:21:58 PM (18 years ago)

Author:

darin

Message:

LayoutTests:

New layout test for ​http://bugzilla.opendarwin.org/show_bug.cgi?id=5826

• fast/overflow/overflow-rtl-expected.checksum: Added.
• fast/overflow/overflow-rtl-expected.png: Added.
• fast/overflow/overflow-rtl-expected.txt: Added.
• fast/overflow/overflow-rtl.html: Added.

WebCore:

Reviewed by Hyatt, landed by Darin.

• fixed ​http://bugzilla.opendarwin.org/show_bug.cgi?id=5826 Blocks with direction:rtl and overflow:auto or scroll have incorrect scrollbars

• khtml/rendering/render_block.cpp: (khtml::RenderBlock::leftmostPosition):
• khtml/rendering/render_layer.cpp: (khtml::RenderLayer::RenderLayer): Initialize (khtml::RenderLayer::scrollOffset): (khtml::RenderLayer::subtractScrollOffset): (khtml::RenderLayer::scrollToOffset): (khtml::RenderLayer::scrollRectToVisible): (khtml::RenderLayer::updateScrollPositionFromScrollbars): (khtml::RenderLayer::computeScrollDimensions): (khtml::RenderLayer::updateScrollInfoAfterLayout):
• khtml/rendering/render_layer.h: (khtml::RenderLayer::scrollXOffset): (khtml::RenderLayer::scrollToYOffset):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/overflow/overflow-rtl-expected.checksum (added)
• LayoutTests/fast/overflow/overflow-rtl-expected.png (added)
• LayoutTests/fast/overflow/overflow-rtl-expected.txt (added)
• LayoutTests/fast/overflow/overflow-rtl.html (added)
• WebCore/ChangeLog-2005-12-19 (modified) (1 diff)
• WebCore/khtml/rendering/render_block.cpp (modified) (1 diff)
• WebCore/khtml/rendering/render_layer.cpp (modified) (11 diffs)
• WebCore/khtml/rendering/render_layer.h (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2005-12-10  Darin Adler  <darin@apple.com>
+
+        New layout test for http://bugzilla.opendarwin.org/show_bug.cgi?id=5826
+
+        * fast/overflow/overflow-rtl-expected.checksum: Added.
+        * fast/overflow/overflow-rtl-expected.png: Added.
+        * fast/overflow/overflow-rtl-expected.txt: Added.
+        * fast/overflow/overflow-rtl.html: Added.
+
 2005-12-10  Darin Adler  <darin@apple.com>
 

trunk/WebCore/ChangeLog-2005-12-19

@@ +1 @@
+2005-12-10  Mitz Pettel  <opendarwin.org@mitzpettel.com>
+
+        Reviewed by Hyatt, landed by Darin.
+
+        - fixed http://bugzilla.opendarwin.org/show_bug.cgi?id=5826
+          Blocks with direction:rtl and overflow:auto or scroll have incorrect scrollbars
+
+        * khtml/rendering/render_block.cpp: (khtml::RenderBlock::leftmostPosition):
+        * khtml/rendering/render_layer.cpp:
+        (khtml::RenderLayer::RenderLayer): Initialize
+        (khtml::RenderLayer::scrollOffset):
+        (khtml::RenderLayer::subtractScrollOffset):
+        (khtml::RenderLayer::scrollToOffset):
+        (khtml::RenderLayer::scrollRectToVisible):
+        (khtml::RenderLayer::updateScrollPositionFromScrollbars):
+        (khtml::RenderLayer::computeScrollDimensions):
+        (khtml::RenderLayer::updateScrollInfoAfterLayout):
+        * khtml/rendering/render_layer.h:
+        (khtml::RenderLayer::scrollXOffset):
+        (khtml::RenderLayer::scrollToYOffset):
+
 2005-12-10  Graham Dennis  <Graham.Dennis@gmail.com>
 

trunk/WebCore/khtml/rendering/render_block.cpp

@@ -2160 +2160 @@
     if (!includeOverflowInterior && hasOverflowClip())
         return left;
-
-    // FIXME: Check left overflow when we eventually support it.
+    if (includeSelf && m_overflowLeft < left)
+        left = m_overflowLeft;
     
     if (m_floatingObjects) {

trunk/WebCore/khtml/rendering/render_layer.cpp

@@ -125 +125 @@
 m_scrollX( 0 ),
 m_scrollY( 0 ),
+m_scrollOriginX( 0 ),
+m_scrollLeftOverflow( 0 ),
 m_scrollWidth( 0 ),
 m_scrollHeight( 0 ),
@@ -489 +491 @@
 RenderLayer::scrollOffset(int& x, int& y)
 {
-    x += scrollXOffset();
+    x += scrollXOffset() + m_scrollLeftOverflow;
     y += scrollYOffset();
 }
@@ -496 +498 @@
 RenderLayer::subtractScrollOffset(int& x, int& y)
 {
-    x -= scrollXOffset();
+    x -= scrollXOffset() + m_scrollLeftOverflow;
     y -= scrollYOffset();
 }
@@ -521 +523 @@
     // is either occluded by another layer or clipped by an enclosing
     // layer or contains fixed backgrounds, etc.).
-    m_scrollX = x;
+    m_scrollX = x - m_scrollOriginX;
     m_scrollY = y;
 
@@ -546 +548 @@
     if (updateScrollbars) {
         if (m_hBar)
-            m_hBar->setValue(m_scrollX);
+            m_hBar->setValue(scrollXOffset());
         if (m_vBar)
             m_vBar->setValue(m_scrollY);
@@ -558 +560 @@
     
     if (m_object->hasOverflowClip()) {
-        QRect layerBounds = QRect(m_x + m_scrollX, m_y + m_scrollY, m_width, m_height);
-        QRect exposeRect = QRect(rect.x() + m_scrollX, rect.y() + m_scrollY, rect.width(), rect.height());
+        QRect layerBounds = QRect(m_x + scrollXOffset(), m_y + m_scrollY, m_width, m_height);
+        QRect exposeRect = QRect(rect.x() + scrollXOffset(), rect.y() + m_scrollY, rect.width(), rect.height());
         QRect r = getRectToExpose(layerBounds, exposeRect, alignX, alignY);
         
@@ -568 +570 @@
         yOffset = kMax(0, kMin(m_scrollHeight - m_height, yOffset));
         
-        if (xOffset != m_scrollX || yOffset != m_scrollY) {
-            int diffX = m_scrollX;
+        if (xOffset != scrollXOffset() || yOffset != m_scrollY) {
+            int diffX = scrollXOffset();
             int diffY = m_scrollY;
             scrollToOffset(xOffset, yOffset);
-            diffX = m_scrollX - diffX;
+            diffX = scrollXOffset() - diffX;
             diffY = m_scrollY - diffY;
             newRect.setX(rect.x() - diffX);
@@ -669 +671 @@
 {
     bool needUpdate = false;
-    int newX = m_scrollX;
+    int newX = scrollXOffset();
     int newY = m_scrollY;
     
     if (m_hBar) {
         newX = m_hBar->value();
-        if (newX != m_scrollX)
+        if (newX != scrollXOffset())
            needUpdate = true;
     }
@@ -796 +798 @@
 {
     m_scrollDimensionsDirty = false;
-
-    int rightPos = m_object->rightmostPosition(true, false) - m_object->borderLeft();
-    int bottomPos = m_object->lowestPosition(true, false) - m_object->borderTop();
+    
+    bool ltr = m_object->style()->direction() == LTR;
 
     int clientWidth = m_object->clientWidth();
     int clientHeight = m_object->clientHeight();
 
+    m_scrollLeftOverflow = ltr ? 0 : kMin(0, m_object->leftmostPosition(true, false) - m_object->borderLeft());
+
+    int rightPos = ltr ?
+                    m_object->rightmostPosition(true, false) - m_object->borderLeft() :
+                    clientWidth - m_scrollLeftOverflow;
+    int bottomPos = m_object->lowestPosition(true, false) - m_object->borderTop();
+
     m_scrollWidth = kMax(rightPos, clientWidth);
     m_scrollHeight = kMax(bottomPos, clientHeight);
+    
+    m_scrollOriginX = ltr ? 0 : m_scrollWidth - clientWidth;
 
     if (needHBar)
@@ -825 +835 @@
         // 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 = kMax(0, kMin(m_scrollX, scrollWidth() - m_object->clientWidth()));
+        int newX = kMax(0, kMin(scrollXOffset(), scrollWidth() - m_object->clientWidth()));
         int newY = kMax(0, kMin(m_scrollY, scrollHeight() - m_object->clientHeight()));
-        if (newX != m_scrollX || newY != m_scrollY)
+        if (newX != scrollXOffset() || newY != m_scrollY)
             scrollToOffset(newX, newY);
     }
@@ -870 +880 @@
         m_hBar->setSteps(LINE_STEP, pageStep);
         m_hBar->setKnobProportion(clientWidth, m_scrollWidth);
+        m_hBar->setValue(scrollXOffset());
     }
     if (m_vBar) {

trunk/WebCore/khtml/rendering/render_layer.h

@@ -241 +241 @@
     void scrollOffset(int& x, int& y);
     void subtractScrollOffset(int& x, int& y);
-    int scrollXOffset() const { return m_scrollX; }
+    int scrollXOffset() const { return m_scrollX + m_scrollOriginX; }
     int scrollYOffset() const { return m_scrollY; }
     void scrollToOffset(int x, int y, bool updateScrollbars = true, bool repaint = true);
     void scrollToXOffset(int x) { scrollToOffset(x, m_scrollY); }
-    void scrollToYOffset(int y) { scrollToOffset(m_scrollX, y); }
+    void scrollToYOffset(int y) { scrollToOffset(m_scrollX + m_scrollOriginX, y); }
     void scrollRectToVisible(const QRect &r, const ScrollAlignment& alignX = gAlignCenterIfNeeded, const ScrollAlignment& alignY = gAlignCenterIfNeeded);
     QRect getRectToExpose(const QRect &visibleRect,  const QRect &exposeRect, const ScrollAlignment& alignX, const ScrollAlignment& alignY);    
@@ -369 +369 @@
     int m_scrollX;
     int m_scrollY;
+    int m_scrollOriginX;
+    int m_scrollLeftOverflow;
     
     // The width/height of our scrolled area.