| Index: Source/core/rendering/RenderBox.cpp
|
| diff --git a/Source/core/rendering/RenderBox.cpp b/Source/core/rendering/RenderBox.cpp
|
| index ad1a31ceef9916a6655be919812bd271853e51b1..5050ed421ab3f0f9018999c76e270213ac168888 100644
|
| --- a/Source/core/rendering/RenderBox.cpp
|
| +++ b/Source/core/rendering/RenderBox.cpp
|
| @@ -4349,14 +4349,14 @@ bool RenderBox::isUnsplittableForPagination() const
|
| return isReplaced() || hasUnsplittableScrollingOverflow() || (parent() && isWritingModeRoot());
|
| }
|
|
|
| -LayoutUnit RenderBox::lineHeight(bool /*firstLine*/, LineDirectionMode direction, LinePositionMode /*linePositionMode*/) const
|
| +LayoutUnit RenderBox::lineHeight(OwnOrFirstLineStyle, LineDirectionMode direction, LinePositionMode /*linePositionMode*/) const
|
| {
|
| if (isReplaced())
|
| return direction == HorizontalLine ? m_marginBox.top() + height() + m_marginBox.bottom() : m_marginBox.right() + width() + m_marginBox.left();
|
| return 0;
|
| }
|
|
|
| -int RenderBox::baselinePosition(FontBaseline baselineType, bool /*firstLine*/, LineDirectionMode direction, LinePositionMode linePositionMode) const
|
| +int RenderBox::baselinePosition(FontBaseline baselineType, OwnOrFirstLineStyle, LineDirectionMode direction, LinePositionMode linePositionMode) const
|
| {
|
| ASSERT(linePositionMode == PositionOnContainingLine);
|
| if (isReplaced()) {
|
|
|