Remove most of FloatingObject.

sky/engine/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 41 matching lines @@
 void LineWidth::updateAvailableWidth(LayoutUnit replacedHeight)
 {
     LayoutUnit height = m_block.logicalHeight();
     LayoutUnit logicalHeight = m_block.minLineHeightForReplacedRenderer(m_isFirstLine, replacedHeight);
     m_left = m_block.logicalLeftOffsetForLine(height, shouldIndentText(), logicalHeight).toFloat();
     m_right = m_block.logicalRightOffsetForLine(height, shouldIndentText(), logicalHeight).toFloat();
 
     computeAvailableWidthFromLeftAndRight();
 }
 
-void LineWidth::shrinkAvailableWidthForNewFloatIfNeeded(FloatingObject* newFloat)
-{
-    LayoutUnit height = m_block.logicalHeight();
-    if (height < m_block.logicalTopForFloat(newFloat) || height >= m_block.logicalBottomForFloat(newFloat))
-        return;
-
-    ShapeOutsideDeltas shapeDeltas;
-    if (ShapeOutsideInfo* shapeOutsideInfo = newFloat->renderer()->shapeOutsideInfo()) {
-        LayoutUnit lineHeight = m_block.lineHeight(m_isFirstLine, m_block.isHorizontalWritingMode() ? HorizontalLine : VerticalLine, PositionOfInteriorLineBoxes);
-        shapeDeltas = shapeOutsideInfo->computeDeltasForContainingBlockLine(m_block, *newFloat, m_block.logicalHeight(), lineHeight);
-    }
-
-    if (newFloat->type() == FloatingObject::FloatLeft) {
-        float newLeft = m_block.logicalRightForFloat(newFloat).toFloat();
-        if (shapeDeltas.isValid()) {
-            if (shapeDeltas.lineOverlapsShape())
-                newLeft += shapeDeltas.rightMarginBoxDelta();
-            else // Per the CSS Shapes spec, If the line doesn't overlap the shape, then ignore this shape for this line.
-                newLeft = m_left;
-        }
-        if (shouldIndentText() && m_block.style()->isLeftToRightDirection())
-            newLeft += floorToInt(m_block.textIndentOffset());
-        m_left = std::max<float>(m_left, newLeft);
-    } else {
-        float newRight = m_block.logicalLeftForFloat(newFloat).toFloat();
-        if (shapeDeltas.isValid()) {
-            if (shapeDeltas.lineOverlapsShape())
-                newRight += shapeDeltas.leftMarginBoxDelta();
-            else // Per the CSS Shapes spec, If the line doesn't overlap the shape, then ignore this shape for this line.
-                newRight = m_right;
-        }
-        if (shouldIndentText() && !m_block.style()->isLeftToRightDirection())
-            newRight -= floorToInt(m_block.textIndentOffset());
-        m_right = std::min<float>(m_right, newRight);
-    }
-
-    computeAvailableWidthFromLeftAndRight();
-}
-
 void LineWidth::commit()
 {
     m_committedWidth += m_uncommittedWidth;
     m_uncommittedWidth = 0;
 }
 
 inline static float availableWidthAtOffset(const RenderBlockFlow& block, const LayoutUnit& offset, bool shouldIndentText, float& newLineLeft, float& newLineRight)
 {
     newLineLeft = block.logicalLeftOffsetForLine(offset, shouldIndentText).toFloat();
     newLineRight = block.logicalRightOffsetForLine(offset, shouldIndentText).toFloat();
@@ skipping 26 matching lines @@
             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);
+    LayoutUnit floatLogicalBottom = 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()))
             break;
 
         if (newLineTop >= floatLogicalBottom)
             break;
 
         newLineTop++;
     }
     updateLineDimension(newLineTop, newLineWidth, newLineLeft, newLineRight);
 }
 
 void LineWidth::fitBelowFloats(bool isFirstLine)
 {
     ASSERT(!m_committedWidth);
     ASSERT(!fitsOnLine());
 
     LayoutUnit floatLogicalBottom;
     LayoutUnit lastFloatLogicalBottom = m_block.logicalHeight();
     float newLineWidth = m_availableWidth;
     float newLineLeft = m_left;
     float newLineRight = m_right;
 
-    FloatingObject* lastFloatFromPreviousLine = (m_block.containsFloats() ? m_block.m_floatingObjects->set().last().get() : 0);
-        if (lastFloatFromPreviousLine && lastFloatFromPreviousLine->renderer()->shapeOutsideInfo())
-            return wrapNextToShapeOutside(isFirstLine);
-
     while (true) {
-        floatLogicalBottom = m_block.nextFloatLogicalBottomBelow(lastFloatLogicalBottom, ShapeOutsideFloatShapeOffset);
+        floatLogicalBottom = lastFloatLogicalBottom;
         if (floatLogicalBottom <= lastFloatLogicalBottom)
             break;
 
         newLineWidth = availableWidthAtOffset(m_block, floatLogicalBottom, shouldIndentText(), newLineLeft, newLineRight);
         lastFloatLogicalBottom = floatLogicalBottom;
 
         if (newLineWidth >= m_uncommittedWidth)
             break;
     }
     updateLineDimension(lastFloatLogicalBottom, newLineWidth, newLineLeft, newLineRight);
 }
 
 void LineWidth::computeAvailableWidthFromLeftAndRight()
 {
     m_availableWidth = max(0.0f, m_right - m_left);
 }
 
 }