Changeset 105903 in webkit

Timestamp:

Jan 25, 2012 11:27:54 AM (12 years ago)

Author:

tony@chromium.org

Message:

support overflow:auto and overflow:scroll in new flexbox
​https://bugs.webkit.org/show_bug.cgi?id=76953

Reviewed by David Hyatt.

Source/WebCore:

Tests: css3/flexbox/flexbox-overflow-auto-expected.html

css3/flexbox/flexbox-overflow-auto.html

• rendering/RenderBox.cpp:

(WebCore::RenderBox::addLayoutOverflow): In the case of reverse flexboxen, we can overflow up or to the left (like horizontal-bt or rtl content).

• rendering/RenderFlexibleBox.cpp:

(WebCore::RenderFlexibleBox::layoutBlock): Call updateScrollInfoAfterLayout() to add overflow scrollbars.
(WebCore::RenderFlexibleBox::layoutAndPlaceChildren): In row-reverse, offset the start of the content by the scrollbar.
(WebCore::RenderFlexibleBox::layoutColumnReverse): In column-reverse, offset the start of the content by the scrollbar.

• rendering/RenderFlexibleBox.h:

(RenderFlexibleBox): Make isHorizontalFlow public.

• rendering/style/RenderStyle.h:

(WebCore::RenderStyleBitfields::isReverseFlexDirection): Convenience method.

LayoutTests:

• css3/flexbox/flexbox-overflow-auto-expected.html: Added.
• css3/flexbox/flexbox-overflow-auto.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/css3/flexbox/flexbox-overflow-auto-expected.html (added)
• LayoutTests/css3/flexbox/flexbox-overflow-auto.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBox.cpp (modified) (2 diffs)
• Source/WebCore/rendering/RenderFlexibleBox.cpp (modified) (4 diffs)
• Source/WebCore/rendering/RenderFlexibleBox.h (modified) (2 diffs)
• Source/WebCore/rendering/style/RenderStyle.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-01-25  Tony Chang  <tony@chromium.org>
+
+        support overflow:auto and overflow:scroll in new flexbox
+        https://bugs.webkit.org/show_bug.cgi?id=76953
+
+        Reviewed by David Hyatt.
+
+        * css3/flexbox/flexbox-overflow-auto-expected.html: Added.
+        * css3/flexbox/flexbox-overflow-auto.html: Added.
+
 2012-01-25  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-01-25  Tony Chang  <tony@chromium.org>
+
+        support overflow:auto and overflow:scroll in new flexbox
+        https://bugs.webkit.org/show_bug.cgi?id=76953
+
+        Reviewed by David Hyatt.
+
+        Tests: css3/flexbox/flexbox-overflow-auto-expected.html
+               css3/flexbox/flexbox-overflow-auto.html
+
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::addLayoutOverflow): In the case of reverse flexboxen, we can overflow up or to the left (like horizontal-bt or rtl content).
+        * rendering/RenderFlexibleBox.cpp:
+        (WebCore::RenderFlexibleBox::layoutBlock): Call updateScrollInfoAfterLayout() to add overflow scrollbars.
+        (WebCore::RenderFlexibleBox::layoutAndPlaceChildren): In row-reverse, offset the start of the content by the scrollbar.
+        (WebCore::RenderFlexibleBox::layoutColumnReverse): In column-reverse, offset the start of the content by the scrollbar.
+        * rendering/RenderFlexibleBox.h:
+        (RenderFlexibleBox): Make isHorizontalFlow public.
+        * rendering/style/RenderStyle.h:
+        (WebCore::RenderStyleBitfields::isReverseFlexDirection): Convenience method.
+
 2012-01-25  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/Source/WebCore/rendering/RenderBox.cpp

@@ -43 +43 @@
 #include "RenderArena.h"
 #include "RenderBoxRegionInfo.h"
+#include "RenderFlexibleBox.h"
 #include "RenderFlowThread.h"
 #include "RenderInline.h"
@@ -3594 +3595 @@
         bool hasTopOverflow = !style()->isLeftToRightDirection() && !isHorizontalWritingMode();
         bool hasLeftOverflow = !style()->isLeftToRightDirection() && isHorizontalWritingMode();
+        if (isFlexibleBox() && style()->isReverseFlexDirection()) {
+            RenderFlexibleBox* flexibleBox = static_cast<RenderFlexibleBox*>(this);
+            if (flexibleBox->isHorizontalFlow())
+                hasLeftOverflow = true;
+            else
+                hasTopOverflow = true;
+        }
         
         if (!hasTopOverflow)

trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp

@@ -176 +176 @@
     m_overflow.clear();
 
+    // For overflow:scroll blocks, ensure we have both scrollbars in place always.
+    if (scrollsOverflow()) {
+        if (style()->overflowX() == OSCROLL)
+            layer()->setHasHorizontalScrollbar(true);
+        if (style()->overflowY() == OSCROLL)
+            layer()->setHasVerticalScrollbar(true);
+    }
+
     layoutFlexItems(relayoutChildren);
 
@@ -191 +199 @@
 
     updateLayerTransform();
+
+    // Update our scroll information if we're overflow:auto/scroll/hidden now that we know if
+    // we overflow or not.
+    if (hasOverflowClip())
+        layer()->updateScrollInfoAfterLayout();
 
     repainter.repaintAfterLayout();
@@ -637 +650 @@
     LayoutUnit mainAxisOffset = flowAwareBorderStart() + flowAwarePaddingStart();
     mainAxisOffset += initialPackingOffset(availableFreeSpace, totalPositiveFlexibility, style()->flexPack(), childSizes.size());
+    if (style()->flexDirection() == FlowRowReverse)
+        mainAxisOffset += isHorizontalFlow() ? verticalScrollbarWidth() : horizontalScrollbarHeight();
 
     LayoutUnit crossAxisOffset = flowAwareBorderBefore() + flowAwarePaddingBefore();
@@ -700 +715 @@
     LayoutUnit mainAxisOffset = logicalHeight() - flowAwareBorderEnd() - flowAwarePaddingEnd();
     mainAxisOffset -= initialPackingOffset(availableFreeSpace, totalPositiveFlexibility, style()->flexPack(), childSizes.size());
+    mainAxisOffset -= isHorizontalFlow() ? verticalScrollbarWidth() : horizontalScrollbarHeight();
 
     LayoutUnit crossAxisOffset = flowAwareBorderBefore() + flowAwarePaddingBefore();

trunk/Source/WebCore/rendering/RenderFlexibleBox.h

@@ -47 +47 @@
     virtual void layoutBlock(bool relayoutChildren, int pageLogicalHeight = 0, BlockLayoutPass = NormalLayoutPass);
 
+    bool isHorizontalFlow() const;
+
 private:
     class TreeOrderIterator;
@@ -54 +56 @@
     bool hasOrthogonalFlow(RenderBox* child) const;
     bool isColumnFlow() const;
-    bool isHorizontalFlow() const;
     bool isLeftToRightFlow() const;
     Length crossAxisLength() const;

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

@@ -809 +809 @@
     EFlexDirection flexDirection() const { return static_cast<EFlexDirection>(rareNonInheritedData->m_flexibleBox->m_flexDirection); }
     bool isColumnFlexDirection() const { return flexDirection() == FlowColumn || flexDirection() == FlowColumnReverse; }
+    bool isReverseFlexDirection() const { return flexDirection() == FlowRowReverse || flexDirection() == FlowColumnReverse; }
     EFlexWrap flexWrap() const { return static_cast<EFlexWrap>(rareNonInheritedData->m_flexibleBox->m_flexWrap); }