| Index: sky/engine/core/rendering/RenderParagraph.cpp
|
| diff --git a/sky/engine/core/rendering/RenderParagraph.cpp b/sky/engine/core/rendering/RenderParagraph.cpp
|
| index cde5a014399b4afce05935ddf253905c59d74a9d..5b2457ea4ed0028a52a51c80ecf651d00cc16348 100644
|
| --- a/sky/engine/core/rendering/RenderParagraph.cpp
|
| +++ b/sky/engine/core/rendering/RenderParagraph.cpp
|
| @@ -1356,9 +1356,16 @@ void RenderParagraph::computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth,
|
| maxLogicalWidth = std::max(minLogicalWidth, maxLogicalWidth);
|
| }
|
|
|
| -int RenderParagraph::firstLineBoxBaseline() const
|
| +int RenderParagraph::firstLineBoxBaseline(FontBaselineOrAuto baselineType) const
|
| {
|
| - return firstLineBox() ? firstLineBox()->logicalTop() + style(true)->fontMetrics().ascent(firstRootBox()->baselineType()) : -1;
|
| + if (!firstLineBox())
|
| + return -1;
|
| + FontBaseline baseline;
|
| + if (baselineType.m_auto)
|
| + baseline = firstRootBox()->baselineType();
|
| + else
|
| + baseline = baselineType.m_baseline;
|
| + return firstLineBox()->logicalTop() + style(true)->fontMetrics().ascent(baseline);
|
| }
|
|
|
| int RenderParagraph::lastLineBoxBaseline(LineDirectionMode lineDirection) const
|
|
|