| Index: Source/core/rendering/RenderBlock.cpp
|
| diff --git a/Source/core/rendering/RenderBlock.cpp b/Source/core/rendering/RenderBlock.cpp
|
| index 604a5d7a1023ed020bad10899689da36ea0bd224..45e5999736d739278736e0c35c43291e5612bc73 100644
|
| --- a/Source/core/rendering/RenderBlock.cpp
|
| +++ b/Source/core/rendering/RenderBlock.cpp
|
| @@ -3747,8 +3747,7 @@ LayoutUnit RenderBlock::lineHeight(bool firstLine, LineDirectionMode direction,
|
| if (isReplaced() && linePositionMode == PositionOnContainingLine)
|
| return RenderBox::lineHeight(firstLine, direction, linePositionMode);
|
|
|
| - RenderStyle* s = styleOrFirstLineStyle(firstLine && document().styleEngine()->usesFirstLineRules());
|
| - return s->computedLineHeight();
|
| + return styleOrFirstLineStyle(firstLine)->computedLineHeight();
|
| }
|
|
|
| int RenderBlock::beforeMarginInLineDirection(LineDirectionMode direction) const
|
| @@ -3822,7 +3821,7 @@ int RenderBlock::firstLineBoxBaseline() const
|
|
|
| if (childrenInline()) {
|
| if (firstLineBox())
|
| - return firstLineBox()->logicalTop() + styleOrFirstLineStyle(true)->fontMetrics().ascent(firstRootBox()->baselineType());
|
| + return firstLineBox()->logicalTop() + firstLineStyle()->fontMetrics().ascent(firstRootBox()->baselineType());
|
| else
|
| return -1;
|
| }
|
|
|