| Index: Source/core/rendering/RenderBlock.h
|
| diff --git a/Source/core/rendering/RenderBlock.h b/Source/core/rendering/RenderBlock.h
|
| index 9e75979774ece27fa2f3d130dcac765e95e42c1f..6aed7b406c086d8eb67e17fd907278ad5efebc17 100644
|
| --- a/Source/core/rendering/RenderBlock.h
|
| +++ b/Source/core/rendering/RenderBlock.h
|
| @@ -84,10 +84,10 @@ public:
|
| bool beingDestroyed() const { return m_beingDestroyed; }
|
|
|
| // These two functions are overridden for inline-block.
|
| - virtual LayoutUnit lineHeight(bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const OVERRIDE FINAL;
|
| - virtual int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const OVERRIDE;
|
| + virtual LayoutUnit lineHeight(OwnOrFirstLineStyle, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const OVERRIDE FINAL;
|
| + virtual int baselinePosition(FontBaseline, OwnOrFirstLineStyle, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const OVERRIDE;
|
|
|
| - LayoutUnit minLineHeightForReplacedRenderer(bool isFirstLine, LayoutUnit replacedHeight) const;
|
| + LayoutUnit minLineHeightForReplacedRenderer(OwnOrFirstLineStyle, LayoutUnit replacedHeight) const;
|
|
|
| RenderLineBoxList* lineBoxes() { return &m_lineBoxes; }
|
|
|
|
|