Changeset 109512 in webkit

Timestamp:

Mar 1, 2012 10:33:00 PM (12 years ago)

Author:

morrita@google.com

Message:

Render overflow controls of an RTL element to its left-side.
​https://bugs.webkit.org/show_bug.cgi?id=54623

This change adds a new flag WTF_USE_RTL_SCROLLBAR and render the
vertical scrollbars and resizers of RTL elements to their left side if
this new flag is enabled.

Patch by Hironori Bono <​hbono@chromium.org> on 2012-03-01
Reviewed by Ryosuke Niwa.

Source/WebCore:

Test: platform/chromium/fast/events/rtl-scrollbar.html

• rendering/RenderBlock.cpp:

(WebCore::RenderBlock::addOverflowFromPositionedObjects): Move child elements right.
(WebCore::RenderBlock::determineLogicalLeftPositionForChild): ditto.

• rendering/RenderBox.cpp:

(WebCore::RenderBox::overflowClipRect): Move the content rectangle right.

• rendering/RenderLayer.cpp:

(WebCore::cornerStart): Added a function that calculates the X position of a resizer.
(WebCore):
(WebCore::cornerRect): Use cornerStart to move a resizer.
(WebCore::RenderLayer::verticalScrollbarStart): Added a function that calculates
the X position of a vertical scrollbar.
(WebCore::RenderLayer::horizontalScrollbarStart): Added a function that calculates
the X position of a horizontal scrollbar.
(WebCore::RenderLayer::scrollbarOffset): Render a vertical scrollbar to the left side
and move a horizontal scrollbar right by the width of the vertical scrollbar.
(WebCore::RenderLayer::invalidateScrollbarRect): ditto.
(WebCore::RenderLayer::positionOverflowControls): ditto.
(WebCore::RenderLayer::hitTestOverflowControls): ditto.

• rendering/RenderLayer.h:

(RenderLayer):

• rendering/style/RenderStyle.h: Added shouldPlaceBlockDirectionScrollbarOnLogicalLeft,

which returns if we need to move a left scrollbar to its right side.

Source/WebKit/chromium:

• features.gypi: Set WTF_USE_RTL_SCROLLBAR to 1 on Chromium.

LayoutTests:

• platform/chromium/fast/events/rtl-scrollbar-expected.txt: Added.
• platform/chromium/fast/events/rtl-scrollbar.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/chromium/fast/events/rtl-scrollbar-expected.txt (added)
• LayoutTests/platform/chromium/fast/events/rtl-scrollbar.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBlock.cpp (modified) (2 diffs)
• Source/WebCore/rendering/RenderBox.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderLayer.cpp (modified) (9 diffs)
• Source/WebCore/rendering/RenderLayer.h (modified) (1 diff)
• Source/WebCore/rendering/style/RenderStyle.h (modified) (1 diff)
• Source/WebKit/chromium/ChangeLog (modified) (1 diff)
• Source/WebKit/chromium/features.gypi (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-03-01  Hironori Bono  <hbono@chromium.org>
+
+        Render overflow controls of an RTL element to its left-side.
+        https://bugs.webkit.org/show_bug.cgi?id=54623
+
+        This change adds a new flag WTF_USE_RTL_SCROLLBAR and render the
+        vertical scrollbars and resizers of RTL elements to their left side if
+        this new flag is enabled.
+
+        Reviewed by Ryosuke Niwa.
+
+        * platform/chromium/fast/events/rtl-scrollbar-expected.txt: Added.
+        * platform/chromium/fast/events/rtl-scrollbar.html: Added.
+
 2012-03-01  Dirk Pranke  <dpranke@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-03-01  Hironori Bono  <hbono@chromium.org>
+
+        Render overflow controls of an RTL element to its left-side.
+        https://bugs.webkit.org/show_bug.cgi?id=54623
+
+        This change adds a new flag WTF_USE_RTL_SCROLLBAR and render the
+        vertical scrollbars and resizers of RTL elements to their left side if
+        this new flag is enabled.
+
+        Reviewed by Ryosuke Niwa.
+
+        Test: platform/chromium/fast/events/rtl-scrollbar.html
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::addOverflowFromPositionedObjects): Move child elements right.
+        (WebCore::RenderBlock::determineLogicalLeftPositionForChild): ditto.
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::overflowClipRect): Move the content rectangle right.
+        * rendering/RenderLayer.cpp:
+        (WebCore::cornerStart): Added a function that calculates the X position of a resizer.
+        (WebCore):
+        (WebCore::cornerRect): Use cornerStart to move a resizer.
+        (WebCore::RenderLayer::verticalScrollbarStart): Added a function that calculates
+        the X position of a vertical scrollbar.
+        (WebCore::RenderLayer::horizontalScrollbarStart): Added a function that calculates
+        the X position of a horizontal scrollbar.
+        (WebCore::RenderLayer::scrollbarOffset): Render a vertical scrollbar to the left side
+        and move a horizontal scrollbar right by the width of the vertical scrollbar.
+        (WebCore::RenderLayer::invalidateScrollbarRect): ditto.
+        (WebCore::RenderLayer::positionOverflowControls): ditto.
+        (WebCore::RenderLayer::hitTestOverflowControls): ditto.
+        * rendering/RenderLayer.h:
+        (RenderLayer):
+        * rendering/style/RenderStyle.h: Added shouldPlaceBlockDirectionScrollbarOnLogicalLeft,
+        which returns if we need to move a left scrollbar to its right side.
+
 2012-03-01  Kent Tamura  <tkent@chromium.org>
 

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -1653 +1653 @@
         
         // Fixed positioned elements don't contribute to layout overflow, since they don't scroll with the content.
-        if (positionedObject->style()->position() != FixedPosition)
-            addOverflowFromChild(positionedObject);
+        if (positionedObject->style()->position() != FixedPosition) {
+            int x = positionedObject->x();
+            if (style()->shouldPlaceBlockDirectionScrollbarOnLogicalLeft())
+                x -= verticalScrollbarWidth();
+            addOverflowFromChild(positionedObject, IntSize(x, positionedObject->y()));
+        }
     }
 }
@@ -2050 +2054 @@
 {
     LayoutUnit startPosition = borderStart() + paddingStart();
+    if (style()->shouldPlaceBlockDirectionScrollbarOnLogicalLeft())
+        startPosition -= verticalScrollbarWidth();
     LayoutUnit totalAvailableLogicalWidth = borderAndPaddingLogicalWidth() + availableLogicalWidth();
 

trunk/Source/WebCore/rendering/RenderBox.cpp

@@ -1233 +1233 @@
 
     // Subtract out scrollbars if we have them.
-    if (layer())
+     if (layer()) {
+        if (style()->shouldPlaceBlockDirectionScrollbarOnLogicalLeft())
+            clipRect.move(layer()->verticalScrollbarWidth(relevancy), 0);
         clipRect.contract(layer()->verticalScrollbarWidth(relevancy), layer()->horizontalScrollbarHeight(relevancy));
+     }
 
     return clipRect;

trunk/Source/WebCore/rendering/RenderLayer.cpp

@@ -1835 +1835 @@
 }
 
+static LayoutUnit cornerStart(const RenderLayer* layer, int minX, int maxX, int thickness)
+{
+    if (layer->renderer()->style()->shouldPlaceBlockDirectionScrollbarOnLogicalLeft())
+        return minX + layer->renderer()->style()->borderLeftWidth();
+    return maxX - thickness - layer->renderer()->style()->borderRightWidth();
+}
+
 static IntRect cornerRect(const RenderLayer* layer, const IntRect& bounds)
 {
@@ -1854 +1861 @@
         verticalThickness = layer->horizontalScrollbar()->height();
     }
-    return IntRect(bounds.maxX() - horizontalThickness - layer->renderer()->style()->borderRightWidth(), 
+    return IntRect(cornerStart(layer, bounds.x(), bounds.maxX(), horizontalThickness),
                    bounds.maxY() - verticalThickness - layer->renderer()->style()->borderBottomWidth(),
                    horizontalThickness, verticalThickness);
@@ -1977 +1984 @@
 }
 
+LayoutUnit RenderLayer::verticalScrollbarStart(int minX, int maxX) const
+{
+    const RenderBox* box = renderBox();
+    if (renderer()->style()->shouldPlaceBlockDirectionScrollbarOnLogicalLeft())
+        return minX + box->borderLeft();
+    return maxX - box->borderRight() - m_vBar->width();
+}
+
+LayoutUnit RenderLayer::horizontalScrollbarStart(int minX) const
+{
+    const RenderBox* box = renderBox();
+    int x = minX + box->borderLeft();
+    if (renderer()->style()->shouldPlaceBlockDirectionScrollbarOnLogicalLeft())
+        x += m_vBar ? m_vBar->width() : resizerCornerRect(this, box->borderBoxRect()).width();
+    return x;
+}
+
 IntSize RenderLayer::scrollbarOffset(const Scrollbar* scrollbar) const
 {
@@ -1982 +2006 @@
 
     if (scrollbar == m_vBar.get())
-        return IntSize(box->width() - box->borderRight() - scrollbar->width(), box->borderTop());
+        return IntSize(verticalScrollbarStart(0, box->width()), box->borderTop());
 
     if (scrollbar == m_hBar.get())
-        return IntSize(box->borderLeft(), box->height() - box->borderBottom() - scrollbar->height());
+        return IntSize(horizontalScrollbarStart(0), box->height() - box->borderBottom() - scrollbar->height());
     
     ASSERT_NOT_REACHED();
@@ -2010 +2034 @@
     ASSERT(box);
     if (scrollbar == m_vBar.get())
-        scrollRect.move(box->width() - box->borderRight() - scrollbar->width(), box->borderTop());
+        scrollRect.move(verticalScrollbarStart(0, box->width()), box->borderTop());
     else
-        scrollRect.move(box->borderLeft(), box->height() - box->borderBottom() - scrollbar->height());
+        scrollRect.move(horizontalScrollbarStart(0), box->height() - box->borderBottom() - scrollbar->height());
     renderer()->repaintRectangle(scrollRect);
 }
@@ -2177 +2201 @@
     IntRect absBounds(borderBox.location() + offsetFromLayer, borderBox.size());
     if (m_vBar)
-        m_vBar->setFrameRect(IntRect(absBounds.maxX() - box->borderRight() - m_vBar->width(),
+        m_vBar->setFrameRect(IntRect(verticalScrollbarStart(absBounds.x(), absBounds.maxX()),
                                      absBounds.y() + box->borderTop(),
                                      m_vBar->width(),
@@ -2183 +2207 @@
 
     if (m_hBar)
-        m_hBar->setFrameRect(IntRect(absBounds.x() + box->borderLeft(),
+        m_hBar->setFrameRect(IntRect(horizontalScrollbarStart(absBounds.x()),
                                      absBounds.maxY() - box->borderBottom() - m_hBar->height(),
                                      absBounds.width() - (box->borderLeft() + box->borderRight()) - scrollCorner.width(),
@@ -2594 +2618 @@
 
     if (m_vBar && m_vBar->shouldParticipateInHitTesting()) {
-        LayoutRect vBarRect(box->width() - box->borderRight() - m_vBar->width(), 
+        LayoutRect vBarRect(verticalScrollbarStart(0, box->width()),
                             box->borderTop(),
                             m_vBar->width(),
@@ -2606 +2630 @@
     resizeControlSize = max(resizeControlRect.width(), 0);
     if (m_hBar && m_hBar->shouldParticipateInHitTesting()) {
-        LayoutRect hBarRect(box->borderLeft(),
+        LayoutRect hBarRect(horizontalScrollbarStart(0),
                             box->height() - box->borderBottom() - m_hBar->height(),
                             box->width() - (box->borderLeft() + box->borderRight()) - (m_vBar ? m_vBar->width() : resizeControlSize),

trunk/Source/WebCore/rendering/RenderLayer.h

@@ -756 +756 @@
     }
 
+    LayoutUnit verticalScrollbarStart(int minX, int maxX) const;
+    LayoutUnit horizontalScrollbarStart(int minX) const;
+
 protected:
     // The bitfields are up here so they will fall into the padding from ScrollableArea on 64-bit.

trunk/Source/WebCore/rendering/style/RenderStyle.h

@@ -970 +970 @@
 #else
     bool hasFilter() const { return false; }
+#endif
+
+#if USE(RTL_SCROLLBAR)
+    bool shouldPlaceBlockDirectionScrollbarOnLogicalLeft() const { return !isLeftToRightDirection() && isHorizontalWritingMode(); }
+#else
+    bool shouldPlaceBlockDirectionScrollbarOnLogicalLeft() const { return false; }
 #endif
         

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2012-03-01  Hironori Bono  <hbono@chromium.org>
+
+        Render overflow controls of an RTL element to its left-side.
+        https://bugs.webkit.org/show_bug.cgi?id=54623
+
+        This change adds a new flag WTF_USE_RTL_SCROLLBAR and render the
+        vertical scrollbars and resizers of RTL elements to their left side if
+        this new flag is enabled.
+
+        Reviewed by Ryosuke Niwa.
+
+        * features.gypi: Set WTF_USE_RTL_SCROLLBAR to 1 on Chromium.
+
 2012-03-01  James Robinson  <jamesr@chromium.org>
 

trunk/Source/WebKit/chromium/features.gypi

@@ -107 +107 @@
       # in Debug or release_valgrind_build=1 builds.
       'WTF_USE_OPENTYPE_SANITIZER=1',
+      'WTF_USE_RTL_SCROLLBAR=1',
       'WTF_USE_SKIA_TEXT=<(enable_skia_text)',
       'WTF_USE_WEBP=1',