flexbox: incorrect flexbox height with overflow:auto on flex item

Source/core/rendering/RenderFlexibleBox.cpp

Index: Source/core/rendering/RenderFlexibleBox.cpp
diff --git a/Source/core/rendering/RenderFlexibleBox.cpp b/Source/core/rendering/RenderFlexibleBox.cpp
index c00acbefc313719cac27c313e843e82d5934b162..ddbc258b1d77c93d1527420b15a248fc4ad14588 100644
--- a/Source/core/rendering/RenderFlexibleBox.cpp
+++ b/Source/core/rendering/RenderFlexibleBox.cpp
@@ -1104,6 +1104,7 @@ void RenderFlexibleBox::layoutAndPlaceChildren(LayoutUnit& crossAxisOffset, cons
         updateAutoMarginsInMainAxis(child, autoMarginOffset);
 
         LayoutUnit childCrossAxisMarginBoxExtent;
+        LayoutUnit crossAxisScrollbarExtentForChild = !isColumnFlow() ? child->scrollbarLogicalHeight() : child->instrinsicScrollbarLogicalWidth();

[cbiesinger, 2014/08/07 02:57:01]

I'd really prefer you to flip the ?: around so you don't need the negation here.

isColumnFlow() ? child->instrinsicScrollbarLogicalWidth() :
child->scrollbarLogicalHeight()

But why not follow the example from the crossAxis* functions and write this
using isHorizontalFlow and the non-logical height/width?

[harpreet.sk, 2014/08/07 12:46:39]

Modified the solution to use isHorizontalFlow and the non-logical height/width 

         if (alignmentForChild(child) == ItemPositionBaseline && !hasAutoMarginsInCrossAxis(child)) {
             LayoutUnit ascent = marginBoxAscentForChild(child);
             LayoutUnit descent = (crossAxisMarginExtentForChild(child) + crossAxisExtentForChild(child)) - ascent;
@@ -1111,9 +1112,9 @@ void RenderFlexibleBox::layoutAndPlaceChildren(LayoutUnit& crossAxisOffset, cons
             maxAscent = std::max(maxAscent, ascent);
             maxDescent = std::max(maxDescent, descent);
 
-            childCrossAxisMarginBoxExtent = maxAscent + maxDescent;
+            childCrossAxisMarginBoxExtent = maxAscent + maxDescent + crossAxisScrollbarExtentForChild;

[tony, 2014/08/06 16:47:22]

I don't see any align-item baseline test cases that go through this code path. 
Please add some.

[harpreet.sk, 2014/08/07 12:46:39]

Actually we should not add crossAxisScrollbarExtentForChild for baseline cases
as while computing descent it takes crossAxisExtentForChild which will include
the scrollbar height.

I added the test cases of align-item baseline just to make sure that they are
working fine.

         } else {
-            childCrossAxisMarginBoxExtent = crossAxisIntrinsicExtentForChild(child) + crossAxisMarginExtentForChild(child);
+            childCrossAxisMarginBoxExtent = crossAxisIntrinsicExtentForChild(child) + crossAxisMarginExtentForChild(child) + crossAxisScrollbarExtentForChild;
         }
         if (!isColumnFlow())
             setLogicalHeight(std::max(logicalHeight(), crossAxisOffset + flowAwareBorderAfter() + flowAwarePaddingAfter() + childCrossAxisMarginBoxExtent + crossAxisScrollbarExtent()));