[CSS Shapes] Properly shrink boxes to avoid shape-outside

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

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
  *           (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com)
  * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 1807 matching lines @@
   return offset - contentSide;
 }
 
 LayoutUnit LayoutBox::shrinkLogicalWidthToAvoidFloats(
     LayoutUnit childMarginStart,
     LayoutUnit childMarginEnd,
     const LayoutBlockFlow* cb) const {
   LayoutUnit logicalTopPosition = logicalTop();
   LayoutUnit startOffsetForContent = cb->startOffsetForContent();
   LayoutUnit endOffsetForContent = cb->endOffsetForContent();
-  LayoutUnit startOffsetForLine =
-      cb->startOffsetForLine(logicalTopPosition, DoNotIndentText);
+  LayoutUnit logicalHeight = cb->logicalHeightForChild(*this);
+  LayoutUnit startOffsetForLine = cb->startOffsetForLine(
+      logicalTopPosition, DoNotIndentText, logicalHeight);
   LayoutUnit endOffsetForLine =
-      cb->endOffsetForLine(logicalTopPosition, DoNotIndentText);
+      cb->endOffsetForLine(logicalTopPosition, DoNotIndentText, logicalHeight);
 
   // If there aren't any floats constraining us then allow the margins to shrink/expand the width as much as they want.
   if (startOffsetForContent == startOffsetForLine &&
       endOffsetForContent == endOffsetForLine)
-    return cb->availableLogicalWidthForLine(logicalTopPosition,
-                                            DoNotIndentText) -
+    return cb->availableLogicalWidthForLine(logicalTopPosition, DoNotIndentText,
+                                            logicalHeight) -
            childMarginStart - childMarginEnd;
 
-  LayoutUnit width =
-      cb->availableLogicalWidthForLine(logicalTopPosition, DoNotIndentText) -
-      std::max(LayoutUnit(), childMarginStart) -
-      std::max(LayoutUnit(), childMarginEnd);
+  LayoutUnit width = cb->availableLogicalWidthForLine(
+                         logicalTopPosition, DoNotIndentText, logicalHeight) -
+                     std::max(LayoutUnit(), childMarginStart) -
+                     std::max(LayoutUnit(), childMarginEnd);
   // We need to see if margins on either the start side or the end side can contain the floats in question. If they can,
   // then just using the line width is inaccurate. In the case where a float completely fits, we don't need to use the line
   // offset at all, but can instead push all the way to the content edge of the containing block. In the case where the float
   // doesn't fit, we can use the line offset, but we need to grow it by the margin to reflect the fact that the margin was
   // "consumed" by the float. Negative margins aren't consumed by the float, and so we ignore them.
   width += portionOfMarginNotConsumedByFloat(
       childMarginStart, startOffsetForContent, startOffsetForLine);
   width += portionOfMarginNotConsumedByFloat(
       childMarginEnd, endOffsetForContent, endOffsetForLine);
   return width;
@@ skipping 3610 matching lines @@
   LayoutRect rect = frameRect();
 
   LayoutBlock* block = containingBlock();
   if (block)
     block->adjustChildDebugRect(rect);
 
   return rect;
 }
 
 }  // namespace blink