Diff
Modified: trunk/Source/WebCore/ChangeLog (291256 => 291257)
--- trunk/Source/WebCore/ChangeLog 2022-03-15 00:17:53 UTC (rev 291256)
+++ trunk/Source/WebCore/ChangeLog 2022-03-15 00:42:00 UTC (rev 291257)
@@ -1,3 +1,63 @@
+2022-03-14 Oriol Brufau <obru...@igalia.com>
+
+ Rename RenderStyle::textDecoration() to RenderStyle::textDecorationLine()
+ https://bugs.webkit.org/show_bug.cgi?id=237400
+
+ Reviewed by Darin Adler.
+
+ Before https://webkit.org/b/237175, the text-decoration-line and
+ text-decoration properties were 2 longhands that shared a computed
+ value, accessed via RenderStyle::textDecoration().
+
+ But now text-decoration is a proper shorthand of text-decoration-line.
+ So it doesn't make much sense to continue accessing the line via
+ textDecoration(), it should be textDecorationLine() instead.
+
+ Same for RenderStyle::setTextDecoration(), etc.
+
+ No tests since it's just a rename, no change in behavior.
+
+ * accessibility/atspi/AccessibilityObjectTextAtspi.cpp:
+ (WebCore::AccessibilityObjectAtspi::textAttributes const):
+ * animation/CSSPropertyAnimation.cpp:
+ (WebCore::CSSPropertyAnimationWrapperMap::CSSPropertyAnimationWrapperMap):
+ * css/CSSComputedStyleDeclaration.cpp:
+ (WebCore::ComputedStyleExtractor::valueForPropertyInStyle):
+ * css/CSSProperties.json:
+ * rendering/TextDecorationPainter.cpp:
+ (WebCore::collectStylesForRenderer):
+ * rendering/style/RenderStyle.cpp:
+ (WebCore::RenderStyle::RenderStyle):
+ (WebCore::RenderStyle::changeAffectsVisualOverflow const):
+ (WebCore::RenderStyle::changeRequiresRepaintIfTextOrBorderOrOutline const):
+ * rendering/style/RenderStyle.h:
+ (WebCore::RenderStyle::textDecorationsInEffect const):
+ (WebCore::RenderStyle::textDecorationLine const):
+ (WebCore::RenderStyle::addToTextDecorationsInEffect):
+ (WebCore::RenderStyle::setTextDecorationsInEffect):
+ (WebCore::RenderStyle::setTextDecorationLine):
+ (WebCore::RenderStyle::initialTextDecorationLine):
+ (WebCore::RenderStyle::InheritedFlags::operator== const):
+ (WebCore::RenderStyle::textDecoration const): Deleted.
+ (WebCore::RenderStyle::setTextDecoration): Deleted.
+ (WebCore::RenderStyle::initialTextDecoration): Deleted.
+ * rendering/style/RenderStyleConstants.h:
+ * rendering/style/StyleVisualData.cpp:
+ (WebCore::StyleVisualData::StyleVisualData):
+ * rendering/style/StyleVisualData.h:
+ (WebCore::StyleVisualData::operator== const):
+ * rendering/svg/SVGInlineTextBox.cpp:
+ (WebCore::findRendererDefininingTextDecoration):
+ * style/InlineTextBoxStyle.cpp:
+ (WebCore::minLogicalTopForTextDecorationLine):
+ (WebCore::maxLogicalBottomForTextDecorationLine):
+ (WebCore::enclosingRendererWithTextDecoration):
+ * style/StyleAdjuster.cpp:
+ (WebCore::Style::Adjuster::adjust const):
+ * style/StyleBuilderConverter.h:
+ (WebCore::Style::BuilderConverter::convertTextDecorationLine):
+ (WebCore::Style::BuilderConverter::convertTextDecoration): Deleted.
+
2022-03-14 Antoine Quint <grao...@webkit.org>
[model] <model interactive> doesn't allow model to be rotated on iOS
Modified: trunk/Source/WebCore/accessibility/atspi/AccessibilityObjectTextAtspi.cpp (291256 => 291257)
--- trunk/Source/WebCore/accessibility/atspi/AccessibilityObjectTextAtspi.cpp 2022-03-15 00:17:53 UTC (rev 291256)
+++ trunk/Source/WebCore/accessibility/atspi/AccessibilityObjectTextAtspi.cpp 2022-03-15 00:42:00 UTC (rev 291257)
@@ -784,8 +784,8 @@
addAttributeIfNeeded("size"_s, makeString(std::round(style.computedFontPixelSize() * 72 / WebCore::screenDPI()), "pt"));
addAttributeIfNeeded("weight"_s, makeString(static_cast<float>(style.fontCascade().weight())));
addAttributeIfNeeded("style"_s, style.fontCascade().italic() ? "italic" : "normal");
- addAttributeIfNeeded("strikethrough"_s, style.textDecoration() & TextDecorationLine::LineThrough ? "true" : "false");
- addAttributeIfNeeded("underline"_s, style.textDecoration() & TextDecorationLine::Underline ? "single" : "none");
+ addAttributeIfNeeded("strikethrough"_s, style.textDecorationLine() & TextDecorationLine::LineThrough ? "true" : "false");
+ addAttributeIfNeeded("underline"_s, style.textDecorationLine() & TextDecorationLine::Underline ? "single" : "none");
addAttributeIfNeeded("invisible"_s, style.visibility() == Visibility::Hidden ? "true" : "false");
addAttributeIfNeeded("editable"_s, m_coreObject->canSetValueAttribute() ? "true" : "false");
addAttributeIfNeeded("direction"_s, style.direction() == TextDirection::LTR ? "ltr" : "rtl");
Modified: trunk/Source/WebCore/animation/CSSPropertyAnimation.cpp (291256 => 291257)
--- trunk/Source/WebCore/animation/CSSPropertyAnimation.cpp 2022-03-15 00:17:53 UTC (rev 291256)
+++ trunk/Source/WebCore/animation/CSSPropertyAnimation.cpp 2022-03-15 00:42:00 UTC (rev 291257)
@@ -3209,7 +3209,7 @@
new DiscretePropertyWrapper<RubyPosition>(CSSPropertyWebkitRubyPosition, &RenderStyle::rubyPosition, &RenderStyle::setRubyPosition),
new DiscretePropertyWrapper<TableLayoutType>(CSSPropertyTableLayout, &RenderStyle::tableLayout, &RenderStyle::setTableLayout),
new DiscretePropertyWrapper<TextAlignMode>(CSSPropertyTextAlign, &RenderStyle::textAlign, &RenderStyle::setTextAlign),
- new DiscretePropertyWrapper<OptionSet<TextDecorationLine>>(CSSPropertyTextDecorationLine, &RenderStyle::textDecoration, &RenderStyle::setTextDecoration),
+ new DiscretePropertyWrapper<OptionSet<TextDecorationLine>>(CSSPropertyTextDecorationLine, &RenderStyle::textDecorationLine, &RenderStyle::setTextDecorationLine),
new DiscretePropertyWrapper<TextDecorationStyle>(CSSPropertyTextDecorationStyle, &RenderStyle::textDecorationStyle, &RenderStyle::setTextDecorationStyle),
new PropertyWrapperVisitedAffectedColor(CSSPropertyTextEmphasisColor, MaybeInvalidColor, &RenderStyle::textEmphasisColor, &RenderStyle::setTextEmphasisColor, &RenderStyle::visitedLinkTextEmphasisColor, &RenderStyle::setVisitedLinkTextEmphasisColor),
new DiscretePropertyWrapper<OptionSet<TextEmphasisPosition>>(CSSPropertyTextEmphasisPosition, &RenderStyle::textEmphasisPosition, &RenderStyle::setTextEmphasisPosition),
Modified: trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (291256 => 291257)
--- trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2022-03-15 00:17:53 UTC (rev 291256)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2022-03-15 00:42:00 UTC (rev 291257)
@@ -3552,7 +3552,7 @@
case CSSPropertyTextAlign:
return cssValuePool.createValue(style.textAlign());
case CSSPropertyTextDecoration:
- return renderTextDecorationLineFlagsToCSSValue(style.textDecoration());
+ return renderTextDecorationLineFlagsToCSSValue(style.textDecorationLine());
#if ENABLE(CSS3_TEXT)
case CSSPropertyWebkitTextAlignLast:
return cssValuePool.createValue(style.textAlignLast());
@@ -3562,7 +3562,7 @@
case CSSPropertyWebkitTextDecoration:
return getCSSPropertyValuesForShorthandProperties(webkitTextDecorationShorthand());
case CSSPropertyTextDecorationLine:
- return renderTextDecorationLineFlagsToCSSValue(style.textDecoration());
+ return renderTextDecorationLineFlagsToCSSValue(style.textDecorationLine());
case CSSPropertyTextDecorationStyle:
return renderTextDecorationStyleFlagsToCSSValue(style.textDecorationStyle());
case CSSPropertyTextDecorationColor:
Modified: trunk/Source/WebCore/css/CSSProperties.json (291256 => 291257)
--- trunk/Source/WebCore/css/CSSProperties.json 2022-03-15 00:17:53 UTC (rev 291256)
+++ trunk/Source/WebCore/css/CSSProperties.json 2022-03-15 00:42:00 UTC (rev 291257)
@@ -6841,8 +6841,7 @@
},
"text-decoration-line": {
"codegen-properties": {
- "name-for-methods": "TextDecoration",
- "converter": "TextDecoration",
+ "converter": "TextDecorationLine",
"aliases": [
"-webkit-text-decoration-line"
]
Modified: trunk/Source/WebCore/rendering/TextDecorationPainter.cpp (291256 => 291257)
--- trunk/Source/WebCore/rendering/TextDecorationPainter.cpp 2022-03-15 00:17:53 UTC (rev 291256)
+++ trunk/Source/WebCore/rendering/TextDecorationPainter.cpp 2022-03-15 00:42:00 UTC (rev 291257)
@@ -369,7 +369,7 @@
auto* current = &renderer;
do {
const auto& style = styleForRenderer(*current);
- extractDecorations(style, style.textDecoration());
+ extractDecorations(style, style.textDecorationLine());
if (current->isRubyText())
return;
Modified: trunk/Source/WebCore/rendering/style/RenderStyle.cpp (291256 => 291257)
--- trunk/Source/WebCore/rendering/style/RenderStyle.cpp 2022-03-15 00:17:53 UTC (rev 291256)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.cpp 2022-03-15 00:42:00 UTC (rev 291257)
@@ -168,7 +168,7 @@
m_inheritedFlags.visibility = static_cast<unsigned>(initialVisibility());
m_inheritedFlags.textAlign = static_cast<unsigned>(initialTextAlign());
m_inheritedFlags.textTransform = static_cast<unsigned>(initialTextTransform());
- m_inheritedFlags.textDecorations = initialTextDecoration().toRaw();
+ m_inheritedFlags.textDecorationLines = initialTextDecorationLine().toRaw();
m_inheritedFlags.cursor = static_cast<unsigned>(initialCursor());
#if ENABLE(CURSOR_VISIBILITY)
m_inheritedFlags.cursorVisibility = static_cast<unsigned>(initialCursorVisibility());
@@ -639,7 +639,7 @@
&& !arePointingToEqualData(m_rareInheritedData->textShadow, other.m_rareInheritedData->textShadow))
return true;
- if (m_inheritedFlags.textDecorations != other.m_inheritedFlags.textDecorations
+ if (m_inheritedFlags.textDecorationLines != other.m_inheritedFlags.textDecorationLines
|| m_rareNonInheritedData->textDecorationStyle != other.m_rareNonInheritedData->textDecorationStyle
|| m_rareInheritedData->textDecorationThickness != other.m_rareInheritedData->textDecorationThickness
|| m_rareInheritedData->textUnderlineOffset != other.m_rareInheritedData->textUnderlineOffset
@@ -1181,8 +1181,8 @@
bool RenderStyle::changeRequiresRepaintIfTextOrBorderOrOutline(const RenderStyle& other, OptionSet<StyleDifferenceContextSensitiveProperty>&) const
{
if (m_inheritedData->color != other.m_inheritedData->color
- || m_inheritedFlags.textDecorations != other.m_inheritedFlags.textDecorations
- || m_visualData->textDecoration != other.m_visualData->textDecoration
+ || m_inheritedFlags.textDecorationLines != other.m_inheritedFlags.textDecorationLines
+ || m_visualData->textDecorationLine != other.m_visualData->textDecorationLine
|| m_rareNonInheritedData->textDecorationStyle != other.m_rareNonInheritedData->textDecorationStyle
|| m_rareNonInheritedData->textDecorationColor != other.m_rareNonInheritedData->textDecorationColor
|| m_rareInheritedData->textDecorationSkipInk != other.m_rareInheritedData->textDecorationSkipInk
Modified: trunk/Source/WebCore/rendering/style/RenderStyle.h (291256 => 291257)
--- trunk/Source/WebCore/rendering/style/RenderStyle.h 2022-03-15 00:17:53 UTC (rev 291256)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.h 2022-03-15 00:42:00 UTC (rev 291257)
@@ -374,8 +374,8 @@
const Length& textIndent() const { return m_rareInheritedData->indent; }
TextAlignMode textAlign() const { return static_cast<TextAlignMode>(m_inheritedFlags.textAlign); }
TextTransform textTransform() const { return static_cast<TextTransform>(m_inheritedFlags.textTransform); }
- OptionSet<TextDecorationLine> textDecorationsInEffect() const { return OptionSet<TextDecorationLine>::fromRaw(m_inheritedFlags.textDecorations); }
- OptionSet<TextDecorationLine> textDecoration() const { return OptionSet<TextDecorationLine>::fromRaw(m_visualData->textDecoration); }
+ OptionSet<TextDecorationLine> textDecorationsInEffect() const { return OptionSet<TextDecorationLine>::fromRaw(m_inheritedFlags.textDecorationLines); }
+ OptionSet<TextDecorationLine> textDecorationLine() const { return OptionSet<TextDecorationLine>::fromRaw(m_visualData->textDecorationLine); }
TextDecorationStyle textDecorationStyle() const { return static_cast<TextDecorationStyle>(m_rareNonInheritedData->textDecorationStyle); }
TextDecorationSkipInk textDecorationSkipInk() const { return static_cast<TextDecorationSkipInk>(m_rareInheritedData->textDecorationSkipInk); }
TextUnderlinePosition textUnderlinePosition() const { return static_cast<TextUnderlinePosition>(m_rareInheritedData->textUnderlinePosition); }
@@ -996,9 +996,9 @@
void setTextIndent(Length&& length) { SET_VAR(m_rareInheritedData, indent, WTFMove(length)); }
void setTextAlign(TextAlignMode v) { m_inheritedFlags.textAlign = static_cast<unsigned>(v); }
void setTextTransform(TextTransform v) { m_inheritedFlags.textTransform = static_cast<unsigned>(v); }
- void addToTextDecorationsInEffect(OptionSet<TextDecorationLine> v) { m_inheritedFlags.textDecorations |= static_cast<unsigned>(v.toRaw()); }
- void setTextDecorationsInEffect(OptionSet<TextDecorationLine> v) { m_inheritedFlags.textDecorations = v.toRaw(); }
- void setTextDecoration(OptionSet<TextDecorationLine> v) { SET_VAR(m_visualData, textDecoration, v.toRaw()); }
+ void addToTextDecorationsInEffect(OptionSet<TextDecorationLine> v) { m_inheritedFlags.textDecorationLines |= static_cast<unsigned>(v.toRaw()); }
+ void setTextDecorationsInEffect(OptionSet<TextDecorationLine> v) { m_inheritedFlags.textDecorationLines = v.toRaw(); }
+ void setTextDecorationLine(OptionSet<TextDecorationLine> v) { SET_VAR(m_visualData, textDecorationLine, v.toRaw()); }
void setTextDecorationStyle(TextDecorationStyle v) { SET_VAR(m_rareNonInheritedData, textDecorationStyle, static_cast<unsigned>(v)); }
void setTextDecorationSkipInk(TextDecorationSkipInk skipInk) { SET_VAR(m_rareInheritedData, textDecorationSkipInk, static_cast<unsigned>(skipInk)); }
void setTextUnderlinePosition(TextUnderlinePosition position) { SET_VAR(m_rareInheritedData, textUnderlinePosition, static_cast<unsigned>(position)); }
@@ -1633,7 +1633,7 @@
// Returning -100% percent here means the line-height is not set.
static Length initialLineHeight() { return Length(-100.0f, LengthType::Percent); }
static TextAlignMode initialTextAlign() { return TextAlignMode::Start; }
- static OptionSet<TextDecorationLine> initialTextDecoration() { return OptionSet<TextDecorationLine> { }; }
+ static OptionSet<TextDecorationLine> initialTextDecorationLine() { return OptionSet<TextDecorationLine> { }; }
static TextDecorationStyle initialTextDecorationStyle() { return TextDecorationStyle::Solid; }
static TextDecorationSkipInk initialTextDecorationSkipInk() { return TextDecorationSkipInk::Auto; }
static TextUnderlinePosition initialTextUnderlinePosition() { return TextUnderlinePosition::Auto; }
@@ -1980,7 +1980,7 @@
unsigned visibility : 2; // Visibility
unsigned textAlign : 4; // TextAlignMode
unsigned textTransform : 2; // TextTransform
- unsigned textDecorations : TextDecorationBits;
+ unsigned textDecorationLines : TextDecorationLineBits;
unsigned cursor : 6; // CursorType
#if ENABLE(CURSOR_VISIBILITY)
unsigned cursorVisibility : 1; // CursorVisibility
@@ -2147,7 +2147,7 @@
&& visibility == other.visibility
&& textAlign == other.textAlign
&& textTransform == other.textTransform
- && textDecorations == other.textDecorations
+ && textDecorationLines == other.textDecorationLines
&& cursor == other.cursor
#if ENABLE(CURSOR_VISIBILITY)
&& cursorVisibility == other.cursorVisibility
Modified: trunk/Source/WebCore/rendering/style/RenderStyleConstants.h (291256 => 291257)
--- trunk/Source/WebCore/rendering/style/RenderStyleConstants.h 2022-03-15 00:17:53 UTC (rev 291256)
+++ trunk/Source/WebCore/rendering/style/RenderStyleConstants.h 2022-03-15 00:42:00 UTC (rev 291257)
@@ -734,7 +734,7 @@
None
};
-static const size_t TextDecorationBits = 4;
+static const size_t TextDecorationLineBits = 4;
enum class TextDecorationLine : uint8_t {
None = 0,
Underline = 1 << 0,
Modified: trunk/Source/WebCore/rendering/style/StyleVisualData.cpp (291256 => 291257)
--- trunk/Source/WebCore/rendering/style/StyleVisualData.cpp 2022-03-15 00:17:53 UTC (rev 291256)
+++ trunk/Source/WebCore/rendering/style/StyleVisualData.cpp 2022-03-15 00:42:00 UTC (rev 291257)
@@ -28,7 +28,7 @@
StyleVisualData::StyleVisualData()
: hasClip(false)
- , textDecoration(RenderStyle::initialTextDecoration().toRaw())
+ , textDecorationLine(RenderStyle::initialTextDecorationLine().toRaw())
, zoom(RenderStyle::initialZoom())
{
}
@@ -39,7 +39,7 @@
: RefCounted<StyleVisualData>()
, clip(other.clip)
, hasClip(other.hasClip)
- , textDecoration(other.textDecoration)
+ , textDecorationLine(other.textDecorationLine)
, zoom(RenderStyle::initialZoom())
{
}
Modified: trunk/Source/WebCore/rendering/style/StyleVisualData.h (291256 => 291257)
--- trunk/Source/WebCore/rendering/style/StyleVisualData.h 2022-03-15 00:17:53 UTC (rev 291256)
+++ trunk/Source/WebCore/rendering/style/StyleVisualData.h 2022-03-15 00:42:00 UTC (rev 291257)
@@ -41,7 +41,7 @@
{
return clip == other.clip
&& hasClip == other.hasClip
- && textDecoration == other.textDecoration
+ && textDecorationLine == other.textDecorationLine
&& zoom == other.zoom;
}
bool operator!=(const StyleVisualData& other) const { return !(*this == other); }
@@ -48,7 +48,7 @@
LengthBox clip;
bool hasClip : 1;
- unsigned textDecoration : TextDecorationBits; // Text decorations defined *only* by this element.
+ unsigned textDecorationLine : TextDecorationLineBits; // Text decorations defined *only* by this element.
float zoom;
private:
Modified: trunk/Source/WebCore/rendering/svg/SVGInlineTextBox.cpp (291256 => 291257)
--- trunk/Source/WebCore/rendering/svg/SVGInlineTextBox.cpp 2022-03-15 00:17:53 UTC (rev 291256)
+++ trunk/Source/WebCore/rendering/svg/SVGInlineTextBox.cpp 2022-03-15 00:42:00 UTC (rev 291257)
@@ -453,7 +453,7 @@
while (parentBox) {
renderer = &parentBox->renderer();
- if (!renderer->style().textDecoration().isEmpty())
+ if (!renderer->style().textDecorationLine().isEmpty())
break;
parentBox = parentBox->parent();
Modified: trunk/Source/WebCore/style/InlineTextBoxStyle.cpp (291256 => 291257)
--- trunk/Source/WebCore/style/InlineTextBoxStyle.cpp 2022-03-15 00:17:53 UTC (rev 291256)
+++ trunk/Source/WebCore/style/InlineTextBoxStyle.cpp 2022-03-15 00:42:00 UTC (rev 291257)
@@ -49,13 +49,13 @@
return false;
}
-static void minLogicalTopForTextDecorationLine(const InlineIterator::LineIterator& line, float& minLogicalTop, const RenderElement* decorationRenderer, OptionSet<TextDecorationLine> textDecoration)
+static void minLogicalTopForTextDecorationLine(const InlineIterator::LineIterator& line, float& minLogicalTop, const RenderElement* decorationRenderer, OptionSet<TextDecorationLine> textDecorationLine)
{
for (auto run = line->firstLeafBox(); run; run.traverseNextOnLine()) {
if (run->renderer().isOutOfFlowPositioned())
continue; // Positioned placeholders don't affect calculations.
- if (!(run->style().textDecorationsInEffect() & textDecoration))
+ if (!(run->style().textDecorationsInEffect() & textDecorationLine))
continue; // If the text decoration isn't in effect on the child, then it must be outside of |decorationRenderer|'s hierarchy.
if (decorationRenderer && decorationRenderer->isRenderInline() && !isAncestorAndWithinBlock(downcast<RenderInline>(*decorationRenderer), &run->renderer()))
@@ -66,13 +66,13 @@
}
}
-static void maxLogicalBottomForTextDecorationLine(const InlineIterator::LineIterator& line, float& maxLogicalBottom, const RenderElement* decorationRenderer, OptionSet<TextDecorationLine> textDecoration)
+static void maxLogicalBottomForTextDecorationLine(const InlineIterator::LineIterator& line, float& maxLogicalBottom, const RenderElement* decorationRenderer, OptionSet<TextDecorationLine> textDecorationLine)
{
for (auto run = line->firstLeafBox(); run; run.traverseNextOnLine()) {
if (run->renderer().isOutOfFlowPositioned())
continue; // Positioned placeholders don't affect calculations.
- if (!(run->style().textDecorationsInEffect() & textDecoration))
+ if (!(run->style().textDecorationsInEffect() & textDecorationLine))
continue; // If the text decoration isn't in effect on the child, then it must be outside of |decorationRenderer|'s hierarchy.
if (decorationRenderer && decorationRenderer->isRenderInline() && !isAncestorAndWithinBlock(downcast<RenderInline>(*decorationRenderer), &run->renderer()))
@@ -83,7 +83,7 @@
}
}
-static const RenderElement* enclosingRendererWithTextDecoration(const RenderText& renderer, OptionSet<TextDecorationLine> textDecoration, bool firstLine)
+static const RenderElement* enclosingRendererWithTextDecoration(const RenderText& renderer, OptionSet<TextDecorationLine> textDecorationLine, bool firstLine)
{
const RenderElement* current = renderer.parent();
do {
@@ -93,7 +93,7 @@
return nullptr;
const RenderStyle& styleToUse = firstLine ? current->firstLineStyle() : current->style();
- if (styleToUse.textDecoration() & textDecoration)
+ if (styleToUse.textDecorationLine() & textDecorationLine)
return current;
current = current->parent();
} while (current && (!current->element() || (!is<HTMLAnchorElement>(*current->element()) && !current->element()->hasTagName(HTMLNames::fontTag))));
Modified: trunk/Source/WebCore/style/StyleAdjuster.cpp (291256 => 291257)
--- trunk/Source/WebCore/style/StyleAdjuster.cpp 2022-03-15 00:17:53 UTC (rev 291256)
+++ trunk/Source/WebCore/style/StyleAdjuster.cpp 2022-03-15 00:42:00 UTC (rev 291257)
@@ -419,9 +419,9 @@
}
if (shouldInheritTextDecorationsInEffect(style, m_element))
- style.addToTextDecorationsInEffect(style.textDecoration());
+ style.addToTextDecorationsInEffect(style.textDecorationLine());
else
- style.setTextDecorationsInEffect(style.textDecoration());
+ style.setTextDecorationsInEffect(style.textDecorationLine());
auto overflowReplacement = [] (Overflow overflow, Overflow overflowInOtherDimension) -> std::optional<Overflow> {
if (overflow != Overflow::Visible && overflow != Overflow::Clip) {
Modified: trunk/Source/WebCore/style/StyleBuilderConverter.h (291256 => 291257)
--- trunk/Source/WebCore/style/StyleBuilderConverter.h 2022-03-15 00:17:53 UTC (rev 291256)
+++ trunk/Source/WebCore/style/StyleBuilderConverter.h 2022-03-15 00:42:00 UTC (rev 291257)
@@ -81,7 +81,7 @@
static LengthSize convertRadius(BuilderState&, const CSSValue&);
static LengthPoint convertPosition(BuilderState&, const CSSValue&);
static LengthPoint convertPositionOrAuto(BuilderState&, const CSSValue&);
- static OptionSet<TextDecorationLine> convertTextDecoration(BuilderState&, const CSSValue&);
+ static OptionSet<TextDecorationLine> convertTextDecorationLine(BuilderState&, const CSSValue&);
template<typename T> static T convertNumber(BuilderState&, const CSSValue&);
template<typename T> static T convertNumberOrAuto(BuilderState&, const CSSValue&);
static short convertWebkitHyphenateLimitLines(BuilderState&, const CSSValue&);
@@ -432,9 +432,9 @@
return LengthPoint(Length(LengthType::Auto), Length(LengthType::Auto));
}
-inline OptionSet<TextDecorationLine> BuilderConverter::convertTextDecoration(BuilderState&, const CSSValue& value)
+inline OptionSet<TextDecorationLine> BuilderConverter::convertTextDecorationLine(BuilderState&, const CSSValue& value)
{
- auto result = RenderStyle::initialTextDecoration();
+ auto result = RenderStyle::initialTextDecorationLine();
if (is<CSSValueList>(value)) {
for (auto& currentValue : downcast<CSSValueList>(value))
result.add(downcast<CSSPrimitiveValue>(currentValue.get()));
