Modified: trunk/Source/WebCore/rendering/TextDecorationPainter.cpp (295443 => 295444)
--- trunk/Source/WebCore/rendering/TextDecorationPainter.cpp 2022-06-10 03:06:22 UTC (rev 295443)
+++ trunk/Source/WebCore/rendering/TextDecorationPainter.cpp 2022-06-10 03:08:10 UTC (rev 295444)
@@ -28,6 +28,7 @@
#include "GraphicsContext.h"
#include "HTMLAnchorElement.h"
#include "HTMLFontElement.h"
+#include "InlineIteratorLineBox.h"
#include "InlineTextBoxStyle.h"
#include "RenderBlock.h"
#include "RenderStyle.h"
@@ -279,7 +280,14 @@
if (m_decorations.contains(TextDecorationLine::Underline)) {
float textDecorationBaseFontSize = 16;
auto defaultGap = m_lineStyle.computedFontSize() / textDecorationBaseFontSize;
- float offset = computeUnderlineOffset(m_lineStyle.textUnderlinePosition(), m_lineStyle.textUnderlineOffset(), m_lineStyle.metricsOfPrimaryFont(), m_textBox, defaultGap);
+ float offset = computeUnderlineOffset({ m_lineStyle
+ , defaultGap
+ , &m_textBox->renderer()
+ , m_textBox->lineBox()->baselineType()
+ , m_textBox->logicalTop()
+ , m_textBox->logicalBottom()
+ , m_textBox->lineBox()
+ });
float wavyOffset = m_styles.underlineStyle == TextDecorationStyle::Wavy ? m_wavyOffset : 0;
FloatRect rect(localOrigin, FloatSize(m_width, textDecorationThickness));
rect.move(0, offset + wavyOffset);
Modified: trunk/Source/WebCore/style/InlineTextBoxStyle.cpp (295443 => 295444)
--- trunk/Source/WebCore/style/InlineTextBoxStyle.cpp 2022-06-10 03:06:22 UTC (rev 295443)
+++ trunk/Source/WebCore/style/InlineTextBoxStyle.cpp 2022-06-10 03:08:10 UTC (rev 295444)
@@ -29,7 +29,6 @@
#include "FontCascade.h"
#include "HTMLAnchorElement.h"
#include "HTMLNames.h"
-#include "InlineIteratorLineBox.h"
#include "InlineIteratorTextBox.h"
#include "LegacyInlineTextBox.h"
#include "LegacyRootInlineBox.h"
@@ -101,10 +100,10 @@
return current;
}
-float computeUnderlineOffset(TextUnderlinePosition underlinePosition, TextUnderlineOffset underlineOffset, const FontMetrics& fontMetrics, const InlineIterator::TextBoxIterator& textRun, float defaultGap)
+float computeUnderlineOffset(const UnderlineOffsetArguments& context)
{
// This represents the gap between the baseline and the closest edge of the underline.
- float gap = std::max<int>(1, std::ceil(defaultGap / 2.0f));
+ float gap = std::max<int>(1, std::ceil(context.defaultGap / 2.0f));
// FIXME: The code for visual overflow detection passes in a null inline text box. This means it is now
// broken for the case where auto needs to behave like "under".
@@ -115,11 +114,14 @@
// even if it is horizontal, but detecting this has performance implications. For now we only work with
// vertical text, since we already determined the baseline type to be ideographic in that
// case.
-
+ auto underlinePosition = context.lineStyle.textUnderlinePosition();
+ auto underlineOffset = context.lineStyle.textUnderlineOffset();
+ auto& fontMetrics = context.lineStyle.metricsOfPrimaryFont();
+
auto resolvedUnderlinePosition = underlinePosition;
if (resolvedUnderlinePosition == TextUnderlinePosition::Auto && underlineOffset.isAuto()) {
- if (textRun)
- resolvedUnderlinePosition = textRun->lineBox()->baselineType() == IdeographicBaseline ? TextUnderlinePosition::Under : TextUnderlinePosition::Auto;
+ if (context.renderer)
+ resolvedUnderlinePosition = context.baselineType == IdeographicBaseline ? TextUnderlinePosition::Under : TextUnderlinePosition::Auto;
else
resolvedUnderlinePosition = TextUnderlinePosition::Auto;
}
@@ -132,22 +134,22 @@
case TextUnderlinePosition::FromFont:
return fontMetrics.ascent() + fontMetrics.underlinePosition() + underlineOffset.lengthOr(0);
case TextUnderlinePosition::Under: {
- ASSERT(textRun);
+ ASSERT(context.lineBox && context.renderer);
// Position underline relative to the bottom edge of the lowest element's content box.
- auto lineBox = textRun->lineBox();
- auto* decorationRenderer = enclosingRendererWithTextDecoration(textRun->renderer(), TextDecorationLine::Underline, lineBox->isFirst());
+ auto* decorationRenderer = enclosingRendererWithTextDecoration(*context.renderer, TextDecorationLine::Underline, context.lineBox->isFirst());
float offset;
- if (textRun->renderer().style().isFlippedLinesWritingMode()) {
- offset = textRun->logicalTop();
- minLogicalTopForTextDecorationLine(lineBox, offset, decorationRenderer, TextDecorationLine::Underline);
- offset = textRun->logicalTop() - offset;
+ if (context.renderer->style().isFlippedLinesWritingMode()) {
+ offset = context.textRunLogicalTop;
+ minLogicalTopForTextDecorationLine(context.lineBox, offset, decorationRenderer, TextDecorationLine::Underline);
+ offset = context.textRunLogicalTop - offset;
} else {
- offset = textRun->logicalBottom();
- maxLogicalBottomForTextDecorationLine(lineBox, offset, decorationRenderer, TextDecorationLine::Underline);
- offset -= textRun->logicalBottom();
+ offset = context.textRunLogicalBottom;
+ maxLogicalBottomForTextDecorationLine(context.lineBox, offset, decorationRenderer, TextDecorationLine::Underline);
+ offset -= context.textRunLogicalBottom;
}
- auto desiredOffset = textRun->logicalHeight() + gap + std::max(offset, 0.0f) + underlineOffset.lengthOr(0);
+ auto textRunLogicalHeight = context.textRunLogicalBottom - context.textRunLogicalTop;
+ auto desiredOffset = textRunLogicalHeight + gap + std::max(offset, 0.0f) + underlineOffset.lengthOr(0);
return std::max<float>(desiredOffset, fontMetrics.ascent());
}
}
@@ -195,7 +197,21 @@
int underlineOffset = 1;
float textDecorationBaseFontSize = 16;
auto defaultGap = lineStyle.computedFontSize() / textDecorationBaseFontSize;
- underlineOffset += computeUnderlineOffset(lineStyle.textUnderlinePosition(), lineStyle.textUnderlineOffset(), lineStyle.metricsOfPrimaryFont(), textRun, defaultGap);
+ // FIXME: RenderStyle calls us with empty textRun but only when TextUnderlinePosition is not Under.
+ ASSERT(textRun || lineStyle.textUnderlinePosition() != TextUnderlinePosition::Under);
+ if (!textRun)
+ underlineOffset += computeUnderlineOffset({ lineStyle, defaultGap });
+ else {
+ underlineOffset += computeUnderlineOffset({ lineStyle
+ , defaultGap
+ , &textRun->renderer()
+ , textRun->lineBox()->baselineType()
+ , textRun->logicalTop()
+ , textRun->logicalBottom()
+ , textRun->lineBox()
+ });
+ }
+
if (decorationStyle == TextDecorationStyle::Wavy) {
overflowResult.extendBottom(underlineOffset + wavyOffset + wavyStrokeParameters.controlPointDistance + strokeThickness - height);
overflowResult.extendTop(-(underlineOffset + wavyOffset - wavyStrokeParameters.controlPointDistance - strokeThickness));
Modified: trunk/Source/WebCore/style/InlineTextBoxStyle.h (295443 => 295444)
--- trunk/Source/WebCore/style/InlineTextBoxStyle.h 2022-06-10 03:06:22 UTC (rev 295443)
+++ trunk/Source/WebCore/style/InlineTextBoxStyle.h 2022-06-10 03:08:10 UTC (rev 295444)
@@ -27,6 +27,7 @@
#include "FontCascade.h"
#include "InlineIteratorBox.h"
+#include "InlineIteratorLineBox.h"
#include "RenderStyleConstants.h"
namespace WebCore {
@@ -53,6 +54,16 @@
};
WavyStrokeParameters getWavyStrokeParameters(float fontSize);
GlyphOverflow visualOverflowForDecorations(const RenderStyle& lineStyle, const InlineIterator::TextBoxIterator&);
-float computeUnderlineOffset(TextUnderlinePosition, TextUnderlineOffset, const FontMetrics&, const InlineIterator::TextBoxIterator&, float textDecorationThickness);
+
+struct UnderlineOffsetArguments {
+ const RenderStyle& lineStyle;
+ float defaultGap { 0 };
+ const RenderText* renderer { nullptr };
+ FontBaseline baselineType { AlphabeticBaseline };
+ float textRunLogicalTop { 0 };
+ float textRunLogicalBottom { 0 };
+ InlineIterator::LineBoxIterator lineBox { };
+};
+float computeUnderlineOffset(const UnderlineOffsetArguments&);
} // namespace WebCore
