Changeset 200261 in webkit

Timestamp:

Apr 29, 2016 1:33:48 PM (8 years ago)

Author:

mmaxfield@apple.com

Message:

[RTL Scrollbars] REGRESSION(r200116): Positioned contents can overlap RTL scrollbars
​https://bugs.webkit.org/show_bug.cgi?id=157164
<rdar://problem/25993610>

Reviewed by Darin Adler.

Source/WebCore:

There was some code left over from the old implementation of RTL_SCROLLBARS
which had some faulty assumptions about the interaction between direction
and scrollbar placement. In particular, once we began obeying the "dir"
attribute in r200116, these assumptions were no longer valid.

Test: fast/scrolling/rtl-scrollbars-positioned-intersect-scrollbars.html

scrollbars/rtl/div-absolute.html
scrollbars/rtl/div-horizontal.html

• rendering/InlineFlowBox.h:

(WebCore::InlineFlowBox::layoutOverflowRect):

• rendering/RenderBlock.cpp:

(WebCore::RenderBlock::computeOverflow): Deleted.

• rendering/RenderBox.cpp:

(WebCore::RenderBox::layoutOverflowRectForPropagation):

• rendering/RenderLayer.cpp:

(WebCore::RenderLayer::computeScrollDimensions):

LayoutTests:

• TestExpectations:
• fast/scrolling/rtl-scrollbars-positioned-intersect-scrollbars-expected.html: Added.
• fast/scrolling/rtl-scrollbars-positioned-intersect-scrollbars.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/TestExpectations (modified) (1 diff)
• LayoutTests/fast/scrolling/rtl-scrollbars-positioned-intersect-scrollbars-expected.html (added)
• LayoutTests/fast/scrolling/rtl-scrollbars-positioned-intersect-scrollbars.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/InlineFlowBox.h (modified) (1 diff)
• Source/WebCore/rendering/RenderBlock.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderBox.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderLayer.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-04-29  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        [RTL Scrollbars] REGRESSION(r200116): Positioned contents can overlap RTL scrollbars
+        https://bugs.webkit.org/show_bug.cgi?id=157164
+        <rdar://problem/25993610>
+
+        Reviewed by Darin Adler.
+
+        * TestExpectations:
+        * fast/scrolling/rtl-scrollbars-positioned-intersect-scrollbars-expected.html: Added.
+        * fast/scrolling/rtl-scrollbars-positioned-intersect-scrollbars.html: Added.
+
 2016-04-29  Joanmarie Diggs  <jdiggs@igalia.com>
 

trunk/LayoutTests/TestExpectations

@@ -990 +990 @@
 fast/scrolling/rtl-scrollbars-listbox-simple.html [ ImageOnlyFailure ]
 fast/scrolling/rtl-scrollbars-listbox.html [ ImageOnlyFailure ]
+fast/scrolling/rtl-scrollbars-positioned-intersect-scrollbars.html [ ImageOnlyFailure ]
 
 # <a download> does not support Blobs

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-04-29  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        [RTL Scrollbars] REGRESSION(r200116): Positioned contents can overlap RTL scrollbars
+        https://bugs.webkit.org/show_bug.cgi?id=157164
+        <rdar://problem/25993610>
+
+        Reviewed by Darin Adler.
+
+        There was some code left over from the old implementation of RTL_SCROLLBARS
+        which had some faulty assumptions about the interaction between direction
+        and scrollbar placement. In particular, once we began obeying the "dir"
+        attribute in r200116, these assumptions were no longer valid.
+
+        Test: fast/scrolling/rtl-scrollbars-positioned-intersect-scrollbars.html
+              scrollbars/rtl/div-absolute.html
+              scrollbars/rtl/div-horizontal.html
+
+        * rendering/InlineFlowBox.h:
+        (WebCore::InlineFlowBox::layoutOverflowRect):
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::computeOverflow): Deleted.
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::layoutOverflowRectForPropagation):
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::computeScrollDimensions):
+
 2016-04-29  Nan Wang  <n_wang@apple.com>
 

trunk/Source/WebCore/rendering/InlineFlowBox.h

@@ -224 +224 @@
     // respectively are flipped when compared to their physical counterparts.  For example minX is on the left in vertical-lr, but it is on the right in vertical-rl.
     LayoutRect layoutOverflowRect(LayoutUnit lineTop, LayoutUnit lineBottom) const
-    { 
+    {
         return m_overflow ? m_overflow->layoutOverflowRect() : enclosingLayoutRect(frameRectIncludingLineHeight(lineTop, lineBottom));
     }

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -1001 +1001 @@
 }
 
+// Overflow is always relative to the border-box of the element in question.
+// Therefore, if the element has a vertical scrollbar placed on the left, an overflow rect at x=2px would conceptually intersect the scrollbar.
 void RenderBlock::computeOverflow(LayoutUnit oldClientAfterEdge, bool)
 {
     clearOverflow();
-    // Add overflow from children.
     addOverflowFromChildren();
 
-    // Add in the overflow from positioned objects.
     addOverflowFromPositionedObjects();
 

trunk/Source/WebCore/rendering/RenderBox.cpp

@@ -4904 +4904 @@
     // Subtract space occupied by scrollbars. They are at their physical edge in this coordinate
     // system, so order is important here: first flip, then subtract scrollbars.
-    if (shouldPlaceBlockDirectionScrollbarOnLeft() && style().isLeftToRightDirection())
+    if (shouldPlaceBlockDirectionScrollbarOnLeft())
         rect.move(verticalScrollbarWidth(), 0);
     rect.contract(verticalScrollbarWidth(), horizontalScrollbarHeight());

trunk/Source/WebCore/rendering/RenderLayer.cpp

@@ -3381 +3381 @@
 
     int scrollableLeftOverflow = overflowLeft() - box->borderLeft();
-    if (box->style().isLeftToRightDirection() && box->shouldPlaceBlockDirectionScrollbarOnLeft() && m_vBar)
-        scrollableLeftOverflow -= m_vBar->occupiedWidth();
+    if (shouldPlaceBlockDirectionScrollbarOnLeft())
+        scrollableLeftOverflow -= verticalScrollbarWidth();
     int scrollableTopOverflow = overflowTop() - box->borderTop();
     setScrollOrigin(IntPoint(-scrollableLeftOverflow, -scrollableTopOverflow));