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

Timestamp:

Dec 24, 2021, 1:59:50 PM (3 years ago)

Author:

[email protected]

Message:

Remove non-standard -webkit-background-composite CSS property
​https://bugs.webkit.org/show_bug.cgi?id=234661

Reviewed by Simon Fraser.

LayoutTests/imported/w3c:

• web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt:
• web-platform-tests/css/cssom/getComputedStyle-detached-subtree-expected.txt:

Source/WebCore:

Allows removing the non-standard -webkit-mask-composite CSS values (which do not match the standard
mask-composite ones) more easily later on.

• css/CSSComputedStyleDeclaration.cpp:

(WebCore::ComputedStyleExtractor::valueForPropertyInStyle):

• css/CSSProperties.json:
• css/parser/CSSPropertyParser.cpp:

(WebCore::consumePrefixedMaskComposite):
(WebCore::consumeMaskComposite):
(WebCore::consumeBackgroundComponent):
(WebCore::CSSPropertyParser::parseSingleValue):
(WebCore::consumePrefixedBackgroundComposite): Deleted.
(WebCore::consumeBackgroundComposite): Deleted.

• rendering/RenderLayerBacking.cpp:

(WebCore::supportsDirectlyCompositedBoxDecorations):

• rendering/style/RenderStyle.h:

(WebCore::RenderStyle::backgroundRepeatY const):
(WebCore::RenderStyle::backgroundComposite const): Deleted.

Source/WebInspectorUI:

• UserInterface/Models/CSSKeywordCompletions.js:

LayoutTests:

• compositing/background-color/background-color-composite-expected.html: Removed.
• compositing/background-color/background-color-composite.html: Removed.
• fast/backgrounds/bgCompositeCopy-expected.txt: Removed.
• fast/backgrounds/bgCompositeCopy.html: Removed.
• fast/backgrounds/composite-highlight-is-invalid-expected.txt: Removed.
• fast/backgrounds/composite-highlight-is-invalid.html: Removed.
• fast/backgrounds/multiple-backgrounds-computed-style-expected.txt:
• fast/backgrounds/multiple-backgrounds-computed-style.html:
• fast/css/getComputedStyle/computed-style-expected.txt:
• fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
• fast/css/getComputedStyle/resources/property-names.js:
• fast/multicol/body-stuck-with-dirty-bit-with-columns.html:
• platform/glib/fast/css/getComputedStyle/computed-style-expected.txt:
• platform/glib/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
• platform/glib/svg/css/getComputedStyle-basic-expected.txt:
• platform/gtk/imported/w3c/web-platform-tests/css/cssom/getComputedStyle-detached-subtree-expected.txt:
• platform/ios/fast/css/getComputedStyle/computed-style-expected.txt:
• platform/ios/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
• platform/ios/imported/w3c/web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt:
• platform/ios/imported/w3c/web-platform-tests/css/cssom/getComputedStyle-detached-subtree-expected.txt:
• platform/ios/svg/css/getComputedStyle-basic-expected.txt:
• 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:
• platform/wpe/imported/w3c/web-platform-tests/css/cssom/getComputedStyle-detached-subtree-expected.txt:
• svg/css/getComputedStyle-basic-expected.txt:

File:

• trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (modified) (1 diff)

trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp

@@ -2779 +2779 @@
             return list;
         }
-        case CSSPropertyWebkitBackgroundComposite:
         case CSSPropertyWebkitMaskComposite:
         case CSSPropertyMaskComposite: {
-            auto& layers = propertyID == CSSPropertyWebkitBackgroundComposite ? style.backgroundLayers() : style.maskLayers();
+            auto& layers = style.maskLayers();
             if (!layers.next())
                 return cssValuePool.createValue(layers.composite(), propertyID);