[css-flexbox] Correctly size flex rows with scrollbars

third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 466 matching lines @@
     flexLength =
         isHorizontalFlow() ? child.style()->width() : child.style()->height();
   return flexLength;
 }
 
 LayoutUnit LayoutFlexibleBox::crossAxisExtentForChild(
     const LayoutBox& child) const {
   return isHorizontalFlow() ? child.size().height() : child.size().width();
 }
 
-static inline LayoutUnit constrainedChildIntrinsicContentLogicalHeight(
-    const LayoutBox& child,
-    LayoutUnit childIntrinsicContentLogicalHeight) {
-  // TODO(cbiesinger): scrollbar height?
-  return child.constrainLogicalHeightByMinMax(
-      childIntrinsicContentLogicalHeight +
-          child.borderAndPaddingLogicalHeight(),
-      childIntrinsicContentLogicalHeight);
-}
-
 LayoutUnit LayoutFlexibleBox::childIntrinsicLogicalHeight(
     const LayoutBox& child) const {
   // This should only be called if the logical height is the cross size
   DCHECK(!hasOrthogonalFlow(child));
   if (needToStretchChildLogicalHeight(child)) {
     LayoutUnit childIntrinsicContentLogicalHeight;
-    if (!child.styleRef().containsSize())
+    if (!child.styleRef().containsSize()) {
       childIntrinsicContentLogicalHeight =
           child.intrinsicContentLogicalHeight();
-    return constrainedChildIntrinsicContentLogicalHeight(
-        child, childIntrinsicContentLogicalHeight);
+    }
+    LayoutUnit childIntrinsicLogicalHeight =
+        childIntrinsicContentLogicalHeight + child.scrollbarLogicalHeight() +
+        child.borderAndPaddingLogicalHeight();
+    return child.constrainLogicalHeightByMinMax(
+        childIntrinsicLogicalHeight, childIntrinsicContentLogicalHeight);
   }
   return child.logicalHeight();
 }
 
 DISABLE_CFI_PERF
 LayoutUnit LayoutFlexibleBox::childIntrinsicLogicalWidth(
     const LayoutBox& child) const {
   // This should only be called if the logical width is the cross size
   DCHECK(hasOrthogonalFlow(child));
   // If our height is auto, make sure that our returned height is unaffected by
@@ skipping 1313 matching lines @@
                             crossAxisExtentForChild(*child)) -
                            ascent;
 
       maxAscent = std::max(maxAscent, ascent);
       maxDescent = std::max(maxDescent, descent);
 
       // TODO(cbiesinger): Take scrollbar into account
       childCrossAxisMarginBoxExtent = maxAscent + maxDescent;
     } else {
       childCrossAxisMarginBoxExtent = crossAxisIntrinsicExtentForChild(*child) +
-                                      crossAxisMarginExtentForChild(*child) +
-                                      crossAxisScrollbarExtentForChild(*child);
+                                      crossAxisMarginExtentForChild(*child);
     }
     if (!isColumnFlow())
       setLogicalHeight(std::max(
           logicalHeight(),
           crossAxisOffset + flowAwareBorderAfter() + flowAwarePaddingAfter() +
               childCrossAxisMarginBoxExtent + crossAxisScrollbarExtent()));
     maxChildCrossAxisExtent =
         std::max(maxChildCrossAxisExtent, childCrossAxisMarginBoxExtent);
 
     mainAxisOffset += flowAwareMarginStartForChild(*child);
@@ skipping 317 matching lines @@
       LayoutUnit originalOffset =
           lineContexts[lineNumber].crossAxisOffset - crossAxisStartEdge;
       LayoutUnit newOffset =
           contentExtent - originalOffset - lineCrossAxisExtent;
       adjustAlignmentForChild(*flexItem.box, newOffset - originalOffset);
     }
   }
 }
 
 }  // namespace blink