Change RenderObject::style(bool) to accept an enum instead

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 35 matching lines @@
     , m_availableWidth(0)
     , m_isFirstLine(isFirstLine)
     , m_shouldIndentText(shouldIndentText)
 {
     updateAvailableWidth();
 }
 
 void LineWidth::updateAvailableWidth(LayoutUnit replacedHeight)
 {
     LayoutUnit height = m_block.logicalHeight();
-    LayoutUnit logicalHeight = m_block.minLineHeightForReplacedRenderer(m_isFirstLine, replacedHeight);
+    LayoutUnit logicalHeight = m_block.minLineHeightForReplacedRenderer(m_isFirstLine ? FirstLineStyle : OwnStyle, 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;
 
     ShapeOutsideInfo* shapeOutsideInfo = newFloat->renderer()->shapeOutsideInfo();
     if (shapeOutsideInfo) {
-        LayoutUnit lineHeight = m_block.lineHeight(m_isFirstLine, m_block.isHorizontalWritingMode() ? HorizontalLine : VerticalLine, PositionOfInteriorLineBoxes);
+        LayoutUnit lineHeight = m_block.lineHeight(m_isFirstLine ? FirstLineStyle : OwnStyle, m_block.isHorizontalWritingMode() ? HorizontalLine : VerticalLine, PositionOfInteriorLineBoxes);
         shapeOutsideInfo->updateDeltasForContainingBlockLine(m_block, *newFloat, m_block.logicalHeight(), lineHeight);
     }
 
     if (newFloat->type() == FloatingObject::FloatLeft) {
         float newLeft = m_block.logicalRightForFloat(newFloat).toFloat();
         if (shapeOutsideInfo) {
             if (shapeOutsideInfo->lineOverlapsShape())
                 newLeft += shapeOutsideInfo->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;
@@ skipping 20 matching lines @@
 void LineWidth::commit()
 {
     m_committedWidth += m_uncommittedWidth;
     m_uncommittedWidth = 0;
 }
 
 void LineWidth::applyOverhang(RenderRubyRun* rubyRun, RenderObject* startRenderer, RenderObject* endRenderer)
 {
     int startOverhang;
     int endOverhang;
-    rubyRun->getOverhang(m_isFirstLine, startRenderer, endRenderer, startOverhang, endOverhang);
+    rubyRun->getOverhang(m_isFirstLine ? FirstLineStyle : OwnStyle, 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)
@@ skipping 26 matching lines @@
     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 lineHeight = m_block.lineHeight(isFirstLine ? FirstLineStyle : OwnStyle, 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()))
@@ skipping 35 matching lines @@
     }
     updateLineDimension(lastFloatLogicalBottom, newLineWidth, newLineLeft, newLineRight);
 }
 
 void LineWidth::computeAvailableWidthFromLeftAndRight()
 {
     m_availableWidth = max(0.0f, m_right - m_left) + m_overhangWidth;
 }
 
 }