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

Source/core/rendering/RootInlineBox.cpp

 /*
  * Copyright (C) 2003, 2006, 2008 Apple Inc. 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
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 709 matching lines @@
 {
     if (box->renderer().isText())
         return box->parent()->logicalTop();
 
     RenderBoxModelObject* renderer = box->boxModelObject();
     ASSERT(renderer->isInline());
     if (!renderer->isInline())
         return 0;
 
     // This method determines the vertical position for inline elements.
-    bool firstLine = isFirstLineStyle();
-    if (firstLine && !renderer->document().styleEngine()->usesFirstLineRules())
-        firstLine = false;
+    OwnOrFirstLineStyle ownOrFirstLineStyle = isFirstLineStyle();
+    if (ownOrFirstLineStyle == FirstLineStyle && !renderer->document().styleEngine()->usesFirstLineRules())
+        ownOrFirstLineStyle = OwnStyle;
 
     // Check the cache.
     bool isRenderInline = renderer->isRenderInline();
-    if (isRenderInline && !firstLine) {
+    if (isRenderInline && ownOrFirstLineStyle == OwnStyle) {
         LayoutUnit verticalPosition = verticalPositionCache.get(renderer, baselineType());
         if (verticalPosition != PositionUndefined)
             return verticalPosition;
     }
 
     LayoutUnit verticalPosition = 0;
     EVerticalAlign verticalAlign = renderer->style()->verticalAlign();
     if (verticalAlign == TOP || verticalAlign == BOTTOM)
         return 0;
 
     RenderObject* parent = renderer->parent();
     if (parent->isRenderInline() && parent->style()->verticalAlign() != TOP && parent->style()->verticalAlign() != BOTTOM)
         verticalPosition = box->parent()->logicalTop();
 
     if (verticalAlign != BASELINE) {
-        const Font& font = parent->style(firstLine)->font();
+        const Font& font = parent->style(ownOrFirstLineStyle)->font();
         const FontMetrics& fontMetrics = font.fontMetrics();
         int fontSize = font.fontDescription().computedPixelSize();
 
         LineDirectionMode lineDirection = parent->isHorizontalWritingMode() ? HorizontalLine : VerticalLine;
 
         if (verticalAlign == SUB)
             verticalPosition += fontSize / 5 + 1;
         else if (verticalAlign == SUPER)
             verticalPosition -= fontSize / 3 + 1;
         else if (verticalAlign == TEXT_TOP)
-            verticalPosition += renderer->baselinePosition(baselineType(), firstLine, lineDirection) - fontMetrics.ascent(baselineType());
+            verticalPosition += renderer->baselinePosition(baselineType(), ownOrFirstLineStyle, lineDirection) - fontMetrics.ascent(baselineType());
         else if (verticalAlign == MIDDLE)
-            verticalPosition = (verticalPosition - static_cast<LayoutUnit>(fontMetrics.xHeight() / 2) - renderer->lineHeight(firstLine, lineDirection) / 2 + renderer->baselinePosition(baselineType(), firstLine, lineDirection)).round();
+            verticalPosition = (verticalPosition - static_cast<LayoutUnit>(fontMetrics.xHeight() / 2) - renderer->lineHeight(ownOrFirstLineStyle, lineDirection) / 2 + renderer->baselinePosition(baselineType(), ownOrFirstLineStyle, lineDirection)).round();
         else if (verticalAlign == TEXT_BOTTOM) {
             verticalPosition += fontMetrics.descent(baselineType());
             // lineHeight - baselinePosition is always 0 for replaced elements (except inline blocks), so don't bother wasting time in that case.
             if (!renderer->isReplaced() || renderer->isInlineBlockOrInlineTable())
-                verticalPosition -= (renderer->lineHeight(firstLine, lineDirection) - renderer->baselinePosition(baselineType(), firstLine, lineDirection));
+                verticalPosition -= (renderer->lineHeight(ownOrFirstLineStyle, lineDirection) - renderer->baselinePosition(baselineType(), ownOrFirstLineStyle, lineDirection));
         } else if (verticalAlign == BASELINE_MIDDLE)
-            verticalPosition += -renderer->lineHeight(firstLine, lineDirection) / 2 + renderer->baselinePosition(baselineType(), firstLine, lineDirection);
+            verticalPosition += -renderer->lineHeight(ownOrFirstLineStyle, lineDirection) / 2 + renderer->baselinePosition(baselineType(), ownOrFirstLineStyle, lineDirection);
         else if (verticalAlign == LENGTH) {
             LayoutUnit lineHeight;
             //Per http://www.w3.org/TR/CSS21/visudet.html#propdef-vertical-align: 'Percentages: refer to the 'line-height' of the element itself'.
             if (renderer->style()->verticalAlignLength().isPercent())
                 lineHeight = renderer->style()->computedLineHeight();
             else
-                lineHeight = renderer->lineHeight(firstLine, lineDirection);
+                lineHeight = renderer->lineHeight(ownOrFirstLineStyle, lineDirection);
             verticalPosition -= valueForLength(renderer->style()->verticalAlignLength(), lineHeight);
         }
     }
 
     // Store the cached value.
-    if (isRenderInline && !firstLine)
+    if (isRenderInline && ownOrFirstLineStyle == OwnStyle)
         verticalPositionCache.set(renderer, baselineType(), verticalPosition);
 
     return verticalPosition;
 }
 
 bool RootInlineBox::includeLeadingForBox(InlineBox* box) const
 {
     if (box->renderer().isReplaced() || (box->renderer().isText() && !box->isText()))
         return false;
 
@@ skipping 79 matching lines @@
 }
 
 #ifndef NDEBUG
 const char* RootInlineBox::boxName() const
 {
     return "RootInlineBox";
 }
 #endif
 
 } // namespace WebCore