Changeset 287356 in webkit for trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp

Timestamp:

Dec 22, 2021, 8:57:45 AM (3 years ago)

Author:

[email protected]

Message:

Internally unprefix -webkit-text-emphasis properties
​https://bugs.webkit.org/show_bug.cgi?id=234602

Reviewed by Antti Koivisto.

LayoutTests/imported/w3c:

Adjust test expectations.

• web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt:
• web-platform-tests/web-animations/animation-model/animation-types/accumulation-per-property-002-expected.txt:
• web-platform-tests/web-animations/animation-model/animation-types/addition-per-property-002-expected.txt:
• web-platform-tests/web-animations/animation-model/animation-types/interpolation-per-property-002-expected.txt:

Source/WebCore:

It's already exposed unprefixed externally, let's reflect this internally as well.

Makes it easier to remove prefixed versions later on if needed, and it's also less confusing when
going through the CSSProperties.json file.

• animation/CSSPropertyAnimation.cpp:

(WebCore::CSSPropertyAnimationWrapperMap::CSSPropertyAnimationWrapperMap):

• css/CSSComputedStyleDeclaration.cpp:

(WebCore::ComputedStyleExtractor::valueForPropertyInStyle):

• css/CSSProperties.json:
• css/CSSValueKeywords.in:
• css/StyleProperties.cpp:

(WebCore::StyleProperties::getPropertyValue const):

• css/parser/CSSPropertyParser.cpp:

(WebCore::CSSPropertyParser::parseSingleValue):
(WebCore::CSSPropertyParser::parseShorthand):

• rendering/RenderElement.cpp:

(WebCore::RenderElement::selectionEmphasisMarkColor const):

• rendering/TextPaintStyle.cpp:

(WebCore::computeTextPaintStyle):

• rendering/style/RenderStyle.cpp:

(WebCore::RenderStyle::unresolvedColorForProperty const):

• style/PropertyAllowlist.cpp:

(WebCore::Style::isValidMarkerStyleProperty):

• style/StyleBuilder.cpp:

(WebCore::Style::isValidVisitedLinkProperty):

• style/StyleBuilderCustom.h:

(WebCore::Style::BuilderCustom::applyInitialTextEmphasisStyle):
(WebCore::Style::BuilderCustom::applyInheritTextEmphasisStyle):
(WebCore::Style::BuilderCustom::applyValueTextEmphasisStyle):
(WebCore::Style::BuilderCustom::applyInitialWebkitTextEmphasisStyle): Deleted.
(WebCore::Style::BuilderCustom::applyInheritWebkitTextEmphasisStyle): Deleted.
(WebCore::Style::BuilderCustom::applyValueWebkitTextEmphasisStyle): Deleted.

LayoutTests:

Adjust test expectations.

• platform/mac/fast/css/getComputedStyle/computed-style-expected.txt:
• platform/mac/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
• platform/mac/svg/css/getComputedStyle-basic-expected.txt:

File:

• trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (modified) (2 diffs)

trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp

@@ -3360 +3360 @@
         case CSSPropertyWebkitTextFillColor:
             return currentColorOrValidColor(&style, style.textFillColor());
-        case CSSPropertyWebkitTextEmphasisColor:
+        case CSSPropertyTextEmphasisColor:
             return currentColorOrValidColor(&style, style.textEmphasisColor());
-        case CSSPropertyWebkitTextEmphasisPosition:
+        case CSSPropertyTextEmphasisPosition:
             return renderEmphasisPositionFlagsToCSSValue(style.textEmphasisPosition());
-        case CSSPropertyWebkitTextEmphasisStyle:
+        case CSSPropertyTextEmphasisStyle:
             switch (style.textEmphasisMark()) {
             case TextEmphasisMark::None:
@@ -4089 +4089 @@
         case CSSPropertyAll:
         case CSSPropertyAnimation:
-        case CSSPropertyWebkitTextEmphasis:
+        case CSSPropertyTextEmphasis:
             break;