| Index: Source/core/rendering/RenderBlock.cpp
|
| diff --git a/Source/core/rendering/RenderBlock.cpp b/Source/core/rendering/RenderBlock.cpp
|
| index dc0f14ec6ecda468d513c4e42e3024e81d51eee7..ad231810717c6dc5d1c696dfd397f4c5d0d82e81 100644
|
| --- a/Source/core/rendering/RenderBlock.cpp
|
| +++ b/Source/core/rendering/RenderBlock.cpp
|
| @@ -155,7 +155,6 @@ private:
|
|
|
| RenderBlock::RenderBlock(ContainerNode* node)
|
| : RenderBox(node)
|
| - , m_lineHeight(-1)
|
| , m_hasMarginBeforeQuirk(false)
|
| , m_hasMarginAfterQuirk(false)
|
| , m_beingDestroyed(false)
|
| @@ -351,7 +350,6 @@ void RenderBlock::styleDidChange(StyleDifference diff, const RenderStyle* oldSty
|
| textAutosizer->record(this);
|
|
|
| propagateStyleToAnonymousChildren(true);
|
| - invalidateLineHeight();
|
|
|
| // It's possible for our border/padding to change, but for the overall logical width of the block to
|
| // end up being the same. We keep track of this change so in layoutBlock, we can know to set relayoutChildren=true.
|
| @@ -3784,16 +3782,8 @@ LayoutUnit RenderBlock::lineHeight(bool firstLine, LineDirectionMode direction,
|
| if (isReplaced() && linePositionMode == PositionOnContainingLine)
|
| return RenderBox::lineHeight(firstLine, direction, linePositionMode);
|
|
|
| - if (firstLine && document().styleEngine()->usesFirstLineRules()) {
|
| - RenderStyle* s = style(firstLine);
|
| - if (s != style())
|
| - return s->computedLineHeight();
|
| - }
|
| -
|
| - if (m_lineHeight == -1)
|
| - m_lineHeight = style()->computedLineHeight();
|
| -
|
| - return m_lineHeight;
|
| + RenderStyle* s = style(firstLine && document().styleEngine()->usesFirstLineRules());
|
| + return s->computedLineHeight();
|
| }
|
|
|
| int RenderBlock::beforeMarginInLineDirection(LineDirectionMode direction) const
|
|
|