Remove CSS_SHAPES feature definition. This should always be on.
[WebKit-https.git] / Source / WebCore / rendering / line / LineWidth.cpp
index 71e05cb..d2224e0 100644 (file)
@@ -85,39 +85,33 @@ void LineWidth::shrinkAvailableWidthForNewFloatIfNeeded(const FloatingObject& ne
 {
     if (!newFloatShrinksLine(newFloat, m_block, m_isFirstLine))
         return;
-#if ENABLE(CSS_SHAPES)
     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);
     }
-#endif
 
     if (newFloat.type() == FloatingObject::FloatLeft) {
         float newLeft = m_block.logicalRightForFloat(newFloat);
         if (shouldIndentText() == IndentText && m_block.style().isLeftToRightDirection())
             newLeft += floorToInt(m_block.textIndentOffset());
-#if ENABLE(CSS_SHAPES)
         if (shapeDeltas.isValid()) {
             if (shapeDeltas.lineOverlapsShape())
                 newLeft += shapeDeltas.rightMarginBoxDelta();
             else // If the line doesn't overlap the shape, then we need to act as if this float didn't exist.
                 newLeft = m_left;
         }
-#endif
         m_left = std::max<float>(m_left, newLeft);
     } else {
         float newRight = m_block.logicalLeftForFloat(newFloat);
         if (shouldIndentText() == IndentText && !m_block.style().isLeftToRightDirection())
             newRight -= floorToInt(m_block.textIndentOffset());
-#if ENABLE(CSS_SHAPES)
         if (shapeDeltas.isValid()) {
             if (shapeDeltas.lineOverlapsShape())
                 newRight += shapeDeltas.leftMarginBoxDelta();
             else // If the line doesn't overlap the shape, then we need to act as if this float didn't exist.
                 newRight = m_right;
         }
-#endif
         m_right = std::min<float>(m_right, newRight);
     }
 
@@ -164,7 +158,6 @@ void LineWidth::updateLineDimension(LayoutUnit newLineTop, LayoutUnit newLineWid
     m_right = newLineRight;
 }
 
-#if ENABLE(CSS_SHAPES)
 void LineWidth::wrapNextToShapeOutside(bool isFirstLine)
 {
     LayoutUnit lineHeight = m_block.lineHeight(isFirstLine, m_block.isHorizontalWritingMode() ? HorizontalLine : VerticalLine, PositionOfInteriorLineBoxes);
@@ -187,14 +180,9 @@ void LineWidth::wrapNextToShapeOutside(bool isFirstLine)
     }
     updateLineDimension(newLineTop, newLineWidth, newLineLeft, newLineRight);
 }
-#endif
 
 void LineWidth::fitBelowFloats(bool isFirstLine)
 {
-#if !ENABLE(CSS_SHAPES)
-    UNUSED_PARAM(isFirstLine);
-#endif
-
     ASSERT(!m_committedWidth);
     ASSERT(!fitsOnLine());
 
@@ -204,11 +192,9 @@ void LineWidth::fitBelowFloats(bool isFirstLine)
     float newLineLeft = m_left;
     float newLineRight = m_right;
 
-#if ENABLE(CSS_SHAPES)
     FloatingObject* lastFloatFromPreviousLine = (m_block.containsFloats() ? m_block.m_floatingObjects->set().last().get() : 0);
     if (lastFloatFromPreviousLine && lastFloatFromPreviousLine->renderer().shapeOutsideInfo())
         return wrapNextToShapeOutside(isFirstLine);
-#endif
 
     while (true) {
         floatLogicalBottom = m_block.nextFloatLogicalBottomBelow(lastFloatLogicalBottom);