[CSS Shapes] Simplify LineWidth::wrapNextToShapeOutside()

Source/core/rendering/line/LineWidth.cpp

 /*
  * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1. Redistributions of source code must retain the above
  *    copyright notice, this list of conditions and the following
  *    disclaimer.
@@ skipping 101 matching lines @@
     rubyRun->getOverhang(m_isFirstLine, startRenderer, endRenderer, startOverhang, endOverhang);
 
     startOverhang = std::min<int>(startOverhang, m_committedWidth);
     m_availableWidth += startOverhang;
 
     endOverhang = std::max(std::min<int>(endOverhang, m_availableWidth - currentWidth()), 0);
     m_availableWidth += endOverhang;
     m_overhangWidth += startOverhang + endOverhang;
 }
 
-inline static float availableWidthAtOffset(const RenderBlockFlow& block, const LayoutUnit& offset, bool shouldIndentText, float& newLineLeft, float& newLineRight)
+inline static float availableWidthAtOffset(const RenderBlockFlow& block, const LayoutUnit& offset, bool shouldIndentText, float& newLineLeft,
+    float& newLineRight, const LayoutUnit& lineHeight = 0)
 {
-    newLineLeft = block.logicalLeftOffsetForLine(offset, shouldIndentText).toFloat();
-    newLineRight = block.logicalRightOffsetForLine(offset, shouldIndentText).toFloat();
+    newLineLeft = block.logicalLeftOffsetForLine(offset, shouldIndentText, lineHeight).toFloat();
+    newLineRight = block.logicalRightOffsetForLine(offset, shouldIndentText, lineHeight).toFloat();
     return std::max(0.0f, newLineRight - newLineLeft);
 }
 
-inline static float availableWidthAtOffset(const RenderBlockFlow& block, const LayoutUnit& offset, bool shouldIndentText)
-{
-    float newLineLeft = block.logicalLeftOffsetForLine(offset, shouldIndentText).toFloat();
-    float newLineRight = block.logicalRightOffsetForLine(offset, shouldIndentText).toFloat();
-    return std::max(0.0f, newLineRight - newLineLeft);
-}
-
 void LineWidth::updateLineDimension(LayoutUnit newLineTop, LayoutUnit newLineWidth, const float& newLineLeft, const float& newLineRight)
 {
     if (newLineWidth <= m_availableWidth)
         return;
 
     m_block.setLogicalHeight(newLineTop);
     m_availableWidth = newLineWidth + m_overhangWidth;
     m_left = newLineLeft;
     m_right = newLineRight;
 }
 
-inline static bool isWholeLineFit(const RenderBlockFlow& block, const LayoutUnit& lineTop, LayoutUnit lineHeight, float uncommittedWidth, bool shouldIndentText)
-{
-    for (LayoutUnit lineBottom = lineTop; lineBottom <= lineTop + lineHeight; lineBottom++) {
-        LayoutUnit availableWidthAtBottom = availableWidthAtOffset(block, lineBottom, shouldIndentText);
-        if (availableWidthAtBottom < uncommittedWidth)
-            return false;
-    }
-    return true;
-}
-
 void LineWidth::wrapNextToShapeOutside(bool isFirstLine)
 {
     LayoutUnit lineHeight = m_block.lineHeight(isFirstLine, m_block.isHorizontalWritingMode() ? HorizontalLine : VerticalLine, PositionOfInteriorLineBoxes);
     LayoutUnit lineLogicalTop = m_block.logicalHeight();
     LayoutUnit newLineTop = lineLogicalTop;
     LayoutUnit floatLogicalBottom = m_block.nextFloatLogicalBottomBelow(lineLogicalTop);
 
     float newLineWidth;
     float newLineLeft = m_left;
     float newLineRight = m_right;
     while (true) {
-        newLineWidth = availableWidthAtOffset(m_block, newLineTop, shouldIndentText(), newLineLeft, newLineRight);
-        if (newLineWidth >= m_uncommittedWidth && isWholeLineFit(m_block, newLineTop, lineHeight, m_uncommittedWidth, shouldIndentText()))
+        newLineWidth = availableWidthAtOffset(m_block, newLineTop, shouldIndentText(), newLineLeft, newLineRight, lineHeight);
+        if (newLineWidth >= m_uncommittedWidth)
             break;
 
         if (newLineTop >= floatLogicalBottom)
             break;
 
         newLineTop++;
     }
     updateLineDimension(newLineTop, newLineWidth, newLineLeft, newLineRight);
 }
 
@@ skipping 26 matching lines @@
     }
     updateLineDimension(lastFloatLogicalBottom, newLineWidth, newLineLeft, newLineRight);
 }
 
 void LineWidth::computeAvailableWidthFromLeftAndRight()
 {
     m_availableWidth = max(0.0f, m_right - m_left) + m_overhangWidth;
 }
 
 }