Index: Source/core/rendering/RenderInline.cpp |
diff --git a/Source/core/rendering/RenderInline.cpp b/Source/core/rendering/RenderInline.cpp |
index 80041d5a9347a75ed72c0db09d8dfafa1641db3b..1f31e0fd90643ea95cdf8e4dac0599d4e6cec00e 100644 |
--- a/Source/core/rendering/RenderInline.cpp |
+++ b/Source/core/rendering/RenderInline.cpp |
@@ -217,8 +217,8 @@ void RenderInline::updateAlwaysCreateLineBoxes(bool fullLayout) |
if (!alwaysCreateLineBoxes && checkFonts && document().styleEngine()->usesFirstLineRules()) { |
// Have to check the first line style as well. |
- parentStyle = parent()->style(true); |
- RenderStyle* childStyle = style(true); |
+ parentStyle = parent()->style(FirstLineStyle); |
+ RenderStyle* childStyle = style(FirstLineStyle); |
alwaysCreateLineBoxes = !parentStyle->font().fontMetrics().hasIdenticalAscentDescentAndLineGap(childStyle->font().fontMetrics()) |
|| childStyle->verticalAlign() != BASELINE |
|| parentStyle->lineHeight() != childStyle->lineHeight(); |
@@ -1277,9 +1277,9 @@ InlineFlowBox* RenderInline::createAndAppendInlineFlowBox() |
return flowBox; |
} |
-LayoutUnit RenderInline::lineHeight(bool firstLine, LineDirectionMode /*direction*/, LinePositionMode /*linePositionMode*/) const |
+LayoutUnit RenderInline::lineHeight(OwnOrFirstLineStyle firstLine, LineDirectionMode /*direction*/, LinePositionMode /*linePositionMode*/) const |
{ |
- if (firstLine && document().styleEngine()->usesFirstLineRules()) { |
+ if (firstLine == FirstLineStyle && document().styleEngine()->usesFirstLineRules()) { |
RenderStyle* s = style(firstLine); |
if (s != style()) |
return s->computedLineHeight(); |
@@ -1288,7 +1288,7 @@ LayoutUnit RenderInline::lineHeight(bool firstLine, LineDirectionMode /*directio |
return style()->computedLineHeight(); |
} |
-int RenderInline::baselinePosition(FontBaseline baselineType, bool firstLine, LineDirectionMode direction, LinePositionMode linePositionMode) const |
+int RenderInline::baselinePosition(FontBaseline baselineType, OwnOrFirstLineStyle firstLine, LineDirectionMode direction, LinePositionMode linePositionMode) const |
{ |
ASSERT(linePositionMode == PositionOnContainingLine); |
const FontMetrics& fontMetrics = style(firstLine)->fontMetrics(); |