Changeset 123067 in webkit

Timestamp:

Jul 18, 2012 7:51:39 PM (12 years ago)

Author:

hbono@chromium.org

Message:

Move contents right when a vertical scrollbar is shown at the left side of an RTL element.
​https://bugs.webkit.org/show_bug.cgi?id=85856

Reviewed by Hajime Morita.

Source/WebCore:

This change prevents the scrollWidth value from being cropped by the width of a
scrollbar when a vertical scrollbar is shown at the left side of an RTL element.
This change also increases the clientLeft value by this scrollbar width and move
contents right to improve compliance with CSSOM <​http://www.w3.org/TR/cssom-view>.

Tests: scrollbars/rtl/div-horizontal.html

scrollbars/rtl/div-vertical.html

• rendering/RenderBlock.cpp:

(WebCore::RenderBlock::paintObject): Move contents to the right.

• rendering/RenderBox.cpp:

(WebCore::RenderBox::topLeftLocationOffset): Move the top-left corner to the right to prevent WebKit from cropping scrollWidth.

• rendering/RenderBox.h:

(WebCore::RenderBox::clientLeft): Increase clientLeft by the width of a scrollbar.

LayoutTests:

This changes adds a couple of tests that verify CSSOM properties of RTL elements
are compliant with <​http://www.w3.org/TR/cssom-view> regardless of their
scrollbar positions.

• platform/chromium/TestExpectations:
• scrollbars/rtl: Added.
• scrollbars/rtl/div-horizontal-expected.txt: Added.
• scrollbars/rtl/div-horizontal.html: Added.
• scrollbars/rtl/div-vertical-expected.txt: Added.
• scrollbars/rtl/div-vertical.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/chromium/TestExpectations (modified) (1 diff)
• LayoutTests/scrollbars/rtl (added)
• LayoutTests/scrollbars/rtl/div-horizontal-expected.txt (added)
• LayoutTests/scrollbars/rtl/div-horizontal.html (added)
• LayoutTests/scrollbars/rtl/div-vertical-expected.txt (added)
• LayoutTests/scrollbars/rtl/div-vertical.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBlock.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderBox.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderBox.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-07-18  Hironori Bono  <hbono@chromium.org>
+
+        Move contents right when a vertical scrollbar is shown at the left side of an RTL element.
+        https://bugs.webkit.org/show_bug.cgi?id=85856
+
+        Reviewed by Hajime Morita.
+
+        This changes adds a couple of tests that verify CSSOM properties of RTL elements
+        are compliant with <http://www.w3.org/TR/cssom-view> regardless of their
+        scrollbar positions.
+
+        * platform/chromium/TestExpectations:
+        * scrollbars/rtl: Added.
+        * scrollbars/rtl/div-horizontal-expected.txt: Added.
+        * scrollbars/rtl/div-horizontal.html: Added.
+        * scrollbars/rtl/div-vertical-expected.txt: Added.
+        * scrollbars/rtl/div-vertical.html: Added.
+
 2012-07-18  Kent Tamura  <tkent@chromium.org>
 

trunk/LayoutTests/platform/chromium/TestExpectations

@@ -3646 +3646 @@
 BUGWK90469 WIN : storage/websql/multiple-databases-garbage-collection.html = PASS CRASH
 
+// Require rebaselines when Bug 85856 is fixed. (The left side of their RTL elements are cropped due to this bug.)
+BUGWK85856 : fast/block/float/028.html = IMAGE
+BUGWK85856 : fast/overflow/unreachable-overflow-rtl-bug.html = IMAGE
+BUGWK85856 : fast/block/float/026.html = IMAGE
+
 // Require rebaseline after bug 88171
 BUGWK88171 WIN : css1/formatting_model/floating_elements.html = IMAGE

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-07-18  Hironori Bono  <hbono@chromium.org>
+
+        Move contents right when a vertical scrollbar is shown at the left side of an RTL element.
+        https://bugs.webkit.org/show_bug.cgi?id=85856
+
+        Reviewed by Hajime Morita.
+
+        This change prevents the scrollWidth value from being cropped by the width of a
+        scrollbar when a vertical scrollbar is shown at the left side of an RTL element.
+        This change also increases the clientLeft value by this scrollbar width and move
+        contents right to improve compliance with CSSOM <http://www.w3.org/TR/cssom-view>.
+
+        Tests: scrollbars/rtl/div-horizontal.html
+               scrollbars/rtl/div-vertical.html
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::paintObject): Move contents to the right.
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::topLeftLocationOffset): Move the top-left corner to the right to prevent WebKit from cropping scrollWidth.
+        * rendering/RenderBox.h:
+        (WebCore::RenderBox::clientLeft): Increase clientLeft by the width of a scrollbar.
+
 2012-07-18  Kent Tamura  <tkent@chromium.org>
 

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -2968 +2968 @@
     // Adjust our painting position if we're inside a scrolled layer (e.g., an overflow:auto div).
     LayoutPoint scrolledOffset = paintOffset;
-    if (hasOverflowClip())
+    if (hasOverflowClip()) {
         scrolledOffset.move(-scrolledContentOffset());
+        if (style()->shouldPlaceBlockDirectionScrollbarOnLogicalLeft())
+            scrolledOffset.move(verticalScrollbarWidth(), 0);
+    }
 
     // 2. paint contents

trunk/Source/WebCore/rendering/RenderBox.cpp

@@ -3939 +3939 @@
     
     LayoutRect rect(frameRect());
+    if (containerBlock->style()->shouldPlaceBlockDirectionScrollbarOnLogicalLeft())
+        rect.move(containerBlock->verticalScrollbarWidth(), 0);
     containerBlock->flipForWritingMode(rect); // FIXME: This is wrong if we are an absolutely positioned object enclosed by a relative-positioned inline.
     return LayoutSize(rect.x(), rect.y());

trunk/Source/WebCore/rendering/RenderBox.h

@@ -198 +198 @@
     // More IE extensions.  clientWidth and clientHeight represent the interior of an object
     // excluding border and scrollbar.  clientLeft/Top are just the borderLeftWidth and borderTopWidth.
-    LayoutUnit clientLeft() const { return borderLeft(); }
+    LayoutUnit clientLeft() const { return borderLeft() + (style()->shouldPlaceBlockDirectionScrollbarOnLogicalLeft() ? verticalScrollbarWidth() : 0); }
     LayoutUnit clientTop() const { return borderTop(); }
     LayoutUnit clientWidth() const;