Diff
Modified: trunk/LayoutTests/ChangeLog (287432 => 287433)
--- trunk/LayoutTests/ChangeLog 2021-12-24 21:39:38 UTC (rev 287432)
+++ trunk/LayoutTests/ChangeLog 2021-12-24 21:59:50 UTC (rev 287433)
@@ -1,3 +1,37 @@
+2021-12-24 Tim Nguyen <[email protected]>
+
+ Remove non-standard -webkit-background-composite CSS property
+ https://bugs.webkit.org/show_bug.cgi?id=234661
+
+ Reviewed by Simon Fraser.
+
+ * 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:
+
2021-12-24 Simon Fraser <[email protected]>
Apply the scroll delta in the "began" wheel event
Deleted: trunk/LayoutTests/compositing/background-color/background-color-composite-expected.html (287432 => 287433)
--- trunk/LayoutTests/compositing/background-color/background-color-composite-expected.html 2021-12-24 21:39:38 UTC (rev 287432)
+++ trunk/LayoutTests/compositing/background-color/background-color-composite-expected.html 2021-12-24 21:59:50 UTC (rev 287433)
@@ -1,30 +0,0 @@
-<html>
- <head>
- <style type="text/css">
- .green {
- width: 100px;
- height: 100px;
- background-color: green;
- display: block;
- padding: 10px;
- -webkit-background-composite: border;
- }
- .blue {
- width: 50px;
- height: 50px;
- background-color: blue;
- display: block;
- }
-
- .composited {
- -webkit-transform: translateZ(0);
- }
- </style>
- </head>
- <body>
- <div class="green">
- <div class="blue">
- </div>
- </div>
- </body>
-</html>
\ No newline at end of file
Deleted: trunk/LayoutTests/compositing/background-color/background-color-composite.html (287432 => 287433)
--- trunk/LayoutTests/compositing/background-color/background-color-composite.html 2021-12-24 21:39:38 UTC (rev 287432)
+++ trunk/LayoutTests/compositing/background-color/background-color-composite.html 2021-12-24 21:59:50 UTC (rev 287433)
@@ -1,30 +0,0 @@
-<html>
- <head>
- <style type="text/css">
- .green {
- width: 100px;
- height: 100px;
- background-color: green;
- display: block;
- padding: 10px;
- -webkit-background-composite: border;
- }
- .blue {
- width: 50px;
- height: 50px;
- background-color: blue;
- display: block;
- }
-
- .composited {
- -webkit-transform: translateZ(0);
- }
- </style>
- </head>
- <body>
- <div class="green composited">
- <div class="blue composited">
- </div>
- </div>
- </body>
-</html>
\ No newline at end of file
Deleted: trunk/LayoutTests/fast/backgrounds/bgCompositeCopy-expected.txt (287432 => 287433)
--- trunk/LayoutTests/fast/backgrounds/bgCompositeCopy-expected.txt 2021-12-24 21:39:38 UTC (rev 287432)
+++ trunk/LayoutTests/fast/backgrounds/bgCompositeCopy-expected.txt 2021-12-24 21:59:50 UTC (rev 287433)
@@ -1,6 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
- RenderBlock {HTML} at (0,0) size 800x600
- RenderBody {BODY} at (8,8) size 784x584
- RenderBlock {DIV} at (0,0) size 85x62
Deleted: trunk/LayoutTests/fast/backgrounds/bgCompositeCopy.html (287432 => 287433)
--- trunk/LayoutTests/fast/backgrounds/bgCompositeCopy.html 2021-12-24 21:39:38 UTC (rev 287432)
+++ trunk/LayoutTests/fast/backgrounds/bgCompositeCopy.html 2021-12-24 21:59:50 UTC (rev 287433)
@@ -1,14 +0,0 @@
-<head>
-<style>
- div {
- background-image:url(resources/rgba16.png);
- -webkit-background-composite:copy;
- }
-</style>
-</head>
-
-<body>
-
-<div style="width:85px; height:62px"></div>
-
-</body>
Deleted: trunk/LayoutTests/fast/backgrounds/composite-highlight-is-invalid-expected.txt (287432 => 287433)
--- trunk/LayoutTests/fast/backgrounds/composite-highlight-is-invalid-expected.txt 2021-12-24 21:39:38 UTC (rev 287432)
+++ trunk/LayoutTests/fast/backgrounds/composite-highlight-is-invalid-expected.txt 2021-12-24 21:59:50 UTC (rev 287433)
@@ -1,3 +0,0 @@
-Tests that highlight is treated the same as an invalid value for a composite operation:
-PASS
-
Deleted: trunk/LayoutTests/fast/backgrounds/composite-highlight-is-invalid.html (287432 => 287433)
--- trunk/LayoutTests/fast/backgrounds/composite-highlight-is-invalid.html 2021-12-24 21:39:38 UTC (rev 287432)
+++ trunk/LayoutTests/fast/backgrounds/composite-highlight-is-invalid.html 2021-12-24 21:59:50 UTC (rev 287433)
@@ -1,15 +0,0 @@
-<style>
-#test1 { -webkit-background-composite: highlight; }
-#test2 { -webkit-background-composite: invalid; }
-</style>
-Tests that highlight is treated the same as an invalid value for a composite operation:<br>
-<div id="result"></div>
-<span id="test1"></span>
-<span id="test2"></span>
-<script>
-value1 = window.getComputedStyle(document.getElementById('test1')).webkitBackgroundComposite;
-value2 = window.getComputedStyle(document.getElementById('test2')).webkitBackgroundComposite;
-result.innerText = value1 === value2 ? "PASS" : "FAIL";
-if (window.testRunner)
- testRunner.dumpAsText();
-</script>
Modified: trunk/LayoutTests/fast/backgrounds/multiple-backgrounds-computed-style-expected.txt (287432 => 287433)
--- trunk/LayoutTests/fast/backgrounds/multiple-backgrounds-computed-style-expected.txt 2021-12-24 21:39:38 UTC (rev 287432)
+++ trunk/LayoutTests/fast/backgrounds/multiple-backgrounds-computed-style-expected.txt 2021-12-24 21:59:50 UTC (rev 287433)
@@ -9,7 +9,6 @@
PASS test("backgroundRepeat", "background-image: none, none, none, none; background-repeat: repeat-x, repeat-y, repeat, no-repeat;") is "repeat-x, repeat-y, repeat, no-repeat"
PASS test("backgroundSize", "background-image: none, none, none; background-size: contain, cover, 20px 10%;") is "contain, cover, 20px 10%"
PASS test("webkitBackgroundSize", "background-image: none, none, none; -webkit-background-size: contain, cover, 20px 10%;") is "contain, cover, 20px 10%"
-PASS test("webkitBackgroundComposite", "background-image: none, none, none; -webkit-background-composite: source-over, copy, destination-in") is "source-over, copy, destination-in"
PASS test("backgroundAttachment", "background-image: none, none, none; background-attachment: fixed, scroll, local;") is "fixed, scroll, local"
PASS test("backgroundClip", "background-image: none, none; background-clip: border-box, padding-box;") is "border-box, padding-box"
PASS test("webkitBackgroundClip", "background-image: none, none; -webkit-background-clip: border-box, padding-box;") is "border-box, padding-box"
Modified: trunk/LayoutTests/fast/backgrounds/multiple-backgrounds-computed-style.html (287432 => 287433)
--- trunk/LayoutTests/fast/backgrounds/multiple-backgrounds-computed-style.html 2021-12-24 21:39:38 UTC (rev 287432)
+++ trunk/LayoutTests/fast/backgrounds/multiple-backgrounds-computed-style.html 2021-12-24 21:59:50 UTC (rev 287433)
@@ -29,7 +29,6 @@
shouldBe('test("backgroundRepeat", "background-image: none, none, none, none; background-repeat: repeat-x, repeat-y, repeat, no-repeat;")', '"repeat-x, repeat-y, repeat, no-repeat"');
shouldBe('test("backgroundSize", "background-image: none, none, none; background-size: contain, cover, 20px 10%;")', '"contain, cover, 20px 10%"');
shouldBe('test("webkitBackgroundSize", "background-image: none, none, none; -webkit-background-size: contain, cover, 20px 10%;")', '"contain, cover, 20px 10%"');
-shouldBe('test("webkitBackgroundComposite", "background-image: none, none, none; -webkit-background-composite: source-over, copy, destination-in")', '"source-over, copy, destination-in"');
shouldBe('test("backgroundAttachment", "background-image: none, none, none; background-attachment: fixed, scroll, local;")', '"fixed, scroll, local"');
shouldBe('test("backgroundClip", "background-image: none, none; background-clip: border-box, padding-box;")', '"border-box, padding-box"');
shouldBe('test("webkitBackgroundClip", "background-image: none, none; -webkit-background-clip: border-box, padding-box;")', '"border-box, padding-box"');
Modified: trunk/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt (287432 => 287433)
--- trunk/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt 2021-12-24 21:39:38 UTC (rev 287432)
+++ trunk/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt 2021-12-24 21:59:50 UTC (rev 287433)
@@ -195,7 +195,6 @@
zoom: 1;
-webkit-backface-visibility: visible;
-webkit-background-clip: border-box;
--webkit-background-composite: source-over;
-webkit-background-origin: padding-box;
-webkit-background-size: auto;
-webkit-border-horizontal-spacing: 0px;
Modified: trunk/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt (287432 => 287433)
--- trunk/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt 2021-12-24 21:39:38 UTC (rev 287432)
+++ trunk/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt 2021-12-24 21:59:50 UTC (rev 287433)
@@ -194,7 +194,6 @@
zoom: 1
-webkit-backface-visibility: visible
-webkit-background-clip: border-box
--webkit-background-composite: source-over
-webkit-background-origin: padding-box
-webkit-background-size: auto
-webkit-border-horizontal-spacing: 0px
Modified: trunk/LayoutTests/fast/css/getComputedStyle/resources/property-names.js (287432 => 287433)
--- trunk/LayoutTests/fast/css/getComputedStyle/resources/property-names.js 2021-12-24 21:39:38 UTC (rev 287432)
+++ trunk/LayoutTests/fast/css/getComputedStyle/resources/property-names.js 2021-12-24 21:59:50 UTC (rev 287433)
@@ -14,7 +14,6 @@
"appearance": true,
"-webkit-backface-visibility": true,
"-webkit-background-clip": true,
- "-webkit-background-composite": true,
"-webkit-background-origin": true,
"-webkit-background-size": true,
"-webkit-border-horizontal-spacing": true,
Modified: trunk/LayoutTests/fast/multicol/body-stuck-with-dirty-bit-with-columns.html (287432 => 287433)
--- trunk/LayoutTests/fast/multicol/body-stuck-with-dirty-bit-with-columns.html 2021-12-24 21:39:38 UTC (rev 287432)
+++ trunk/LayoutTests/fast/multicol/body-stuck-with-dirty-bit-with-columns.html 2021-12-24 21:59:50 UTC (rev 287433)
@@ -3,7 +3,7 @@
*{
-webkit-columns: 55px 87;
overflow-y: scroll;
- -webkit-background-composite: source-out;
+ background-blend-mode: color;
width: 0%;
}
*|* {
Modified: trunk/LayoutTests/imported/w3c/ChangeLog (287432 => 287433)
--- trunk/LayoutTests/imported/w3c/ChangeLog 2021-12-24 21:39:38 UTC (rev 287432)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2021-12-24 21:59:50 UTC (rev 287433)
@@ -1,5 +1,15 @@
2021-12-24 Tim Nguyen <[email protected]>
+ Remove non-standard -webkit-background-composite CSS property
+ https://bugs.webkit.org/show_bug.cgi?id=234661
+
+ Reviewed by Simon Fraser.
+
+ * web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt:
+ * web-platform-tests/css/cssom/getComputedStyle-detached-subtree-expected.txt:
+
+2021-12-24 Tim Nguyen <[email protected]>
+
Remove non-standard -webkit-margin-collapse CSS property and longhands
https://bugs.webkit.org/show_bug.cgi?id=190788
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt (287432 => 287433)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt 2021-12-24 21:39:38 UTC (rev 287432)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt 2021-12-24 21:59:50 UTC (rev 287433)
@@ -333,7 +333,6 @@
PASS -apple-trailing-word
PASS -webkit-backdrop-filter
PASS -webkit-background-clip
-PASS -webkit-background-composite
PASS -webkit-background-origin
PASS -webkit-background-size
PASS -webkit-border-horizontal-spacing
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/css/cssom/getComputedStyle-detached-subtree-expected.txt (287432 => 287433)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/cssom/getComputedStyle-detached-subtree-expected.txt 2021-12-24 21:39:38 UTC (rev 287432)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/cssom/getComputedStyle-detached-subtree-expected.txt 2021-12-24 21:59:50 UTC (rev 287433)
@@ -1,8 +1,8 @@
PASS getComputedStyle returns no style for detached element
-FAIL getComputedStyle returns no style for element in non-rendered iframe (display: none) assert_equals: expected 0 but got 395
-FAIL getComputedStyle returns no style for element in non-rendered iframe (display: none) from iframe's window assert_equals: expected 0 but got 395
-FAIL getComputedStyle returns no style for element outside the flat tree assert_equals: expected 0 but got 395
-FAIL getComputedStyle returns no style for descendant outside the flat tree assert_equals: expected 0 but got 395
+FAIL getComputedStyle returns no style for element in non-rendered iframe (display: none) assert_equals: expected 0 but got 394
+FAIL getComputedStyle returns no style for element in non-rendered iframe (display: none) from iframe's window assert_equals: expected 0 but got 394
+FAIL getComputedStyle returns no style for element outside the flat tree assert_equals: expected 0 but got 394
+FAIL getComputedStyle returns no style for descendant outside the flat tree assert_equals: expected 0 but got 394
PASS getComputedStyle returns no style for shadow tree outside of flattened tree
Modified: trunk/LayoutTests/platform/glib/fast/css/getComputedStyle/computed-style-expected.txt (287432 => 287433)
--- trunk/LayoutTests/platform/glib/fast/css/getComputedStyle/computed-style-expected.txt 2021-12-24 21:39:38 UTC (rev 287432)
+++ trunk/LayoutTests/platform/glib/fast/css/getComputedStyle/computed-style-expected.txt 2021-12-24 21:59:50 UTC (rev 287433)
@@ -198,7 +198,6 @@
z-index: auto;
zoom: 1;
-webkit-background-clip: border-box;
--webkit-background-composite: source-over;
-webkit-background-origin: padding-box;
-webkit-background-size: auto;
-webkit-border-horizontal-spacing: 0px;
Modified: trunk/LayoutTests/platform/glib/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt (287432 => 287433)
--- trunk/LayoutTests/platform/glib/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt 2021-12-24 21:39:38 UTC (rev 287432)
+++ trunk/LayoutTests/platform/glib/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt 2021-12-24 21:59:50 UTC (rev 287433)
@@ -197,7 +197,6 @@
z-index: auto
zoom: 1
-webkit-background-clip: border-box
--webkit-background-composite: source-over
-webkit-background-origin: padding-box
-webkit-background-size: auto
-webkit-border-horizontal-spacing: 0px
Modified: trunk/LayoutTests/platform/glib/svg/css/getComputedStyle-basic-expected.txt (287432 => 287433)
--- trunk/LayoutTests/platform/glib/svg/css/getComputedStyle-basic-expected.txt 2021-12-24 21:39:38 UTC (rev 287432)
+++ trunk/LayoutTests/platform/glib/svg/css/getComputedStyle-basic-expected.txt 2021-12-24 21:59:50 UTC (rev 287433)
@@ -394,8 +394,6 @@
rect: style.getPropertyCSSValue(zoom) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(-webkit-background-clip) : border-box
rect: style.getPropertyCSSValue(-webkit-background-clip) : [object CSSPrimitiveValue]
-rect: style.getPropertyValue(-webkit-background-composite) : source-over
-rect: style.getPropertyCSSValue(-webkit-background-composite) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(-webkit-background-origin) : padding-box
rect: style.getPropertyCSSValue(-webkit-background-origin) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(-webkit-background-size) : auto
@@ -900,8 +898,6 @@
g: style.getPropertyCSSValue(zoom) : [object CSSPrimitiveValue]
g: style.getPropertyValue(-webkit-background-clip) : border-box
g: style.getPropertyCSSValue(-webkit-background-clip) : [object CSSPrimitiveValue]
-g: style.getPropertyValue(-webkit-background-composite) : source-over
-g: style.getPropertyCSSValue(-webkit-background-composite) : [object CSSPrimitiveValue]
g: style.getPropertyValue(-webkit-background-origin) : padding-box
g: style.getPropertyCSSValue(-webkit-background-origin) : [object CSSPrimitiveValue]
g: style.getPropertyValue(-webkit-background-size) : auto
Modified: trunk/LayoutTests/platform/gtk/imported/w3c/web-platform-tests/css/cssom/getComputedStyle-detached-subtree-expected.txt (287432 => 287433)
--- trunk/LayoutTests/platform/gtk/imported/w3c/web-platform-tests/css/cssom/getComputedStyle-detached-subtree-expected.txt 2021-12-24 21:39:38 UTC (rev 287432)
+++ trunk/LayoutTests/platform/gtk/imported/w3c/web-platform-tests/css/cssom/getComputedStyle-detached-subtree-expected.txt 2021-12-24 21:59:50 UTC (rev 287433)
@@ -1,8 +1,8 @@
PASS getComputedStyle returns no style for detached element
-FAIL getComputedStyle returns no style for element in non-rendered iframe (display: none) assert_equals: expected 0 but got 392
-FAIL getComputedStyle returns no style for element in non-rendered iframe (display: none) from iframe's window assert_equals: expected 0 but got 392
-FAIL getComputedStyle returns no style for element outside the flat tree assert_equals: expected 0 but got 392
-FAIL getComputedStyle returns no style for descendant outside the flat tree assert_equals: expected 0 but got 392
+FAIL getComputedStyle returns no style for element in non-rendered iframe (display: none) assert_equals: expected 0 but got 391
+FAIL getComputedStyle returns no style for element in non-rendered iframe (display: none) from iframe's window assert_equals: expected 0 but got 391
+FAIL getComputedStyle returns no style for element outside the flat tree assert_equals: expected 0 but got 391
+FAIL getComputedStyle returns no style for descendant outside the flat tree assert_equals: expected 0 but got 391
PASS getComputedStyle returns no style for shadow tree outside of flattened tree
Modified: trunk/LayoutTests/platform/ios/fast/css/getComputedStyle/computed-style-expected.txt (287432 => 287433)
--- trunk/LayoutTests/platform/ios/fast/css/getComputedStyle/computed-style-expected.txt 2021-12-24 21:39:38 UTC (rev 287432)
+++ trunk/LayoutTests/platform/ios/fast/css/getComputedStyle/computed-style-expected.txt 2021-12-24 21:59:50 UTC (rev 287433)
@@ -198,7 +198,6 @@
z-index: auto;
zoom: 1;
-webkit-background-clip: border-box;
--webkit-background-composite: source-over;
-webkit-background-origin: padding-box;
-webkit-background-size: auto;
-webkit-border-horizontal-spacing: 0px;
Modified: trunk/LayoutTests/platform/ios/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt (287432 => 287433)
--- trunk/LayoutTests/platform/ios/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt 2021-12-24 21:39:38 UTC (rev 287432)
+++ trunk/LayoutTests/platform/ios/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt 2021-12-24 21:59:50 UTC (rev 287433)
@@ -197,7 +197,6 @@
z-index: auto
zoom: 1
-webkit-background-clip: border-box
--webkit-background-composite: source-over
-webkit-background-origin: padding-box
-webkit-background-size: auto
-webkit-border-horizontal-spacing: 0px
Modified: trunk/LayoutTests/platform/ios/imported/w3c/web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt (287432 => 287433)
--- trunk/LayoutTests/platform/ios/imported/w3c/web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt 2021-12-24 21:39:38 UTC (rev 287432)
+++ trunk/LayoutTests/platform/ios/imported/w3c/web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt 2021-12-24 21:59:50 UTC (rev 287433)
@@ -305,7 +305,6 @@
PASS -webkit-backdrop-filter
PASS -webkit-backface-visibility
PASS -webkit-background-clip
-PASS -webkit-background-composite
PASS -webkit-background-origin
PASS -webkit-background-size
PASS -webkit-border-horizontal-spacing
Modified: trunk/LayoutTests/platform/ios/imported/w3c/web-platform-tests/css/cssom/getComputedStyle-detached-subtree-expected.txt (287432 => 287433)
--- trunk/LayoutTests/platform/ios/imported/w3c/web-platform-tests/css/cssom/getComputedStyle-detached-subtree-expected.txt 2021-12-24 21:39:38 UTC (rev 287432)
+++ trunk/LayoutTests/platform/ios/imported/w3c/web-platform-tests/css/cssom/getComputedStyle-detached-subtree-expected.txt 2021-12-24 21:59:50 UTC (rev 287433)
@@ -1,8 +1,8 @@
PASS getComputedStyle returns no style for detached element
-FAIL getComputedStyle returns no style for element in non-rendered iframe (display: none) assert_equals: expected 0 but got 397
-FAIL getComputedStyle returns no style for element in non-rendered iframe (display: none) from iframe's window assert_equals: expected 0 but got 397
-FAIL getComputedStyle returns no style for element outside the flat tree assert_equals: expected 0 but got 397
-FAIL getComputedStyle returns no style for descendant outside the flat tree assert_equals: expected 0 but got 397
+FAIL getComputedStyle returns no style for element in non-rendered iframe (display: none) assert_equals: expected 0 but got 396
+FAIL getComputedStyle returns no style for element in non-rendered iframe (display: none) from iframe's window assert_equals: expected 0 but got 396
+FAIL getComputedStyle returns no style for element outside the flat tree assert_equals: expected 0 but got 396
+FAIL getComputedStyle returns no style for descendant outside the flat tree assert_equals: expected 0 but got 396
PASS getComputedStyle returns no style for shadow tree outside of flattened tree
Modified: trunk/LayoutTests/platform/ios/svg/css/getComputedStyle-basic-expected.txt (287432 => 287433)
--- trunk/LayoutTests/platform/ios/svg/css/getComputedStyle-basic-expected.txt 2021-12-24 21:39:38 UTC (rev 287432)
+++ trunk/LayoutTests/platform/ios/svg/css/getComputedStyle-basic-expected.txt 2021-12-24 21:59:50 UTC (rev 287433)
@@ -394,8 +394,6 @@
rect: style.getPropertyCSSValue(zoom) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(-webkit-background-clip) : border-box
rect: style.getPropertyCSSValue(-webkit-background-clip) : [object CSSPrimitiveValue]
-rect: style.getPropertyValue(-webkit-background-composite) : source-over
-rect: style.getPropertyCSSValue(-webkit-background-composite) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(-webkit-background-origin) : padding-box
rect: style.getPropertyCSSValue(-webkit-background-origin) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(-webkit-background-size) : auto
@@ -900,8 +898,6 @@
g: style.getPropertyCSSValue(zoom) : [object CSSPrimitiveValue]
g: style.getPropertyValue(-webkit-background-clip) : border-box
g: style.getPropertyCSSValue(-webkit-background-clip) : [object CSSPrimitiveValue]
-g: style.getPropertyValue(-webkit-background-composite) : source-over
-g: style.getPropertyCSSValue(-webkit-background-composite) : [object CSSPrimitiveValue]
g: style.getPropertyValue(-webkit-background-origin) : padding-box
g: style.getPropertyCSSValue(-webkit-background-origin) : [object CSSPrimitiveValue]
g: style.getPropertyValue(-webkit-background-size) : auto
Modified: trunk/LayoutTests/platform/mac/fast/css/getComputedStyle/computed-style-expected.txt (287432 => 287433)
--- trunk/LayoutTests/platform/mac/fast/css/getComputedStyle/computed-style-expected.txt 2021-12-24 21:39:38 UTC (rev 287432)
+++ trunk/LayoutTests/platform/mac/fast/css/getComputedStyle/computed-style-expected.txt 2021-12-24 21:59:50 UTC (rev 287433)
@@ -198,7 +198,6 @@
z-index: auto;
zoom: 1;
-webkit-background-clip: border-box;
--webkit-background-composite: source-over;
-webkit-background-origin: padding-box;
-webkit-background-size: auto;
-webkit-border-horizontal-spacing: 0px;
Modified: trunk/LayoutTests/platform/mac/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt (287432 => 287433)
--- trunk/LayoutTests/platform/mac/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt 2021-12-24 21:39:38 UTC (rev 287432)
+++ trunk/LayoutTests/platform/mac/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt 2021-12-24 21:59:50 UTC (rev 287433)
@@ -197,7 +197,6 @@
z-index: auto
zoom: 1
-webkit-background-clip: border-box
--webkit-background-composite: source-over
-webkit-background-origin: padding-box
-webkit-background-size: auto
-webkit-border-horizontal-spacing: 0px
Modified: trunk/LayoutTests/platform/mac/svg/css/getComputedStyle-basic-expected.txt (287432 => 287433)
--- trunk/LayoutTests/platform/mac/svg/css/getComputedStyle-basic-expected.txt 2021-12-24 21:39:38 UTC (rev 287432)
+++ trunk/LayoutTests/platform/mac/svg/css/getComputedStyle-basic-expected.txt 2021-12-24 21:59:50 UTC (rev 287433)
@@ -394,8 +394,6 @@
rect: style.getPropertyCSSValue(zoom) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(-webkit-background-clip) : border-box
rect: style.getPropertyCSSValue(-webkit-background-clip) : [object CSSPrimitiveValue]
-rect: style.getPropertyValue(-webkit-background-composite) : source-over
-rect: style.getPropertyCSSValue(-webkit-background-composite) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(-webkit-background-origin) : padding-box
rect: style.getPropertyCSSValue(-webkit-background-origin) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(-webkit-background-size) : auto
@@ -900,8 +898,6 @@
g: style.getPropertyCSSValue(zoom) : [object CSSPrimitiveValue]
g: style.getPropertyValue(-webkit-background-clip) : border-box
g: style.getPropertyCSSValue(-webkit-background-clip) : [object CSSPrimitiveValue]
-g: style.getPropertyValue(-webkit-background-composite) : source-over
-g: style.getPropertyCSSValue(-webkit-background-composite) : [object CSSPrimitiveValue]
g: style.getPropertyValue(-webkit-background-origin) : padding-box
g: style.getPropertyCSSValue(-webkit-background-origin) : [object CSSPrimitiveValue]
g: style.getPropertyValue(-webkit-background-size) : auto
Modified: trunk/LayoutTests/platform/wpe/imported/w3c/web-platform-tests/css/cssom/getComputedStyle-detached-subtree-expected.txt (287432 => 287433)
--- trunk/LayoutTests/platform/wpe/imported/w3c/web-platform-tests/css/cssom/getComputedStyle-detached-subtree-expected.txt 2021-12-24 21:39:38 UTC (rev 287432)
+++ trunk/LayoutTests/platform/wpe/imported/w3c/web-platform-tests/css/cssom/getComputedStyle-detached-subtree-expected.txt 2021-12-24 21:59:50 UTC (rev 287433)
@@ -1,8 +1,8 @@
PASS getComputedStyle returns no style for detached element
-FAIL getComputedStyle returns no style for element in non-rendered iframe (display: none) assert_equals: expected 0 but got 391
-FAIL getComputedStyle returns no style for element in non-rendered iframe (display: none) from iframe's window assert_equals: expected 0 but got 391
-FAIL getComputedStyle returns no style for element outside the flat tree assert_equals: expected 0 but got 391
-FAIL getComputedStyle returns no style for descendant outside the flat tree assert_equals: expected 0 but got 391
+FAIL getComputedStyle returns no style for element in non-rendered iframe (display: none) assert_equals: expected 0 but got 390
+FAIL getComputedStyle returns no style for element in non-rendered iframe (display: none) from iframe's window assert_equals: expected 0 but got 390
+FAIL getComputedStyle returns no style for element outside the flat tree assert_equals: expected 0 but got 390
+FAIL getComputedStyle returns no style for descendant outside the flat tree assert_equals: expected 0 but got 390
PASS getComputedStyle returns no style for shadow tree outside of flattened tree
Modified: trunk/LayoutTests/svg/css/getComputedStyle-basic-expected.txt (287432 => 287433)
--- trunk/LayoutTests/svg/css/getComputedStyle-basic-expected.txt 2021-12-24 21:39:38 UTC (rev 287432)
+++ trunk/LayoutTests/svg/css/getComputedStyle-basic-expected.txt 2021-12-24 21:59:50 UTC (rev 287433)
@@ -388,8 +388,6 @@
rect: style.getPropertyCSSValue(-webkit-backface-visibility) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(-webkit-background-clip) : border-box
rect: style.getPropertyCSSValue(-webkit-background-clip) : [object CSSPrimitiveValue]
-rect: style.getPropertyValue(-webkit-background-composite) : source-over
-rect: style.getPropertyCSSValue(-webkit-background-composite) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(-webkit-background-origin) : padding-box
rect: style.getPropertyCSSValue(-webkit-background-origin) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(-webkit-background-size) : auto
@@ -906,8 +904,6 @@
g: style.getPropertyCSSValue(-webkit-backface-visibility) : [object CSSPrimitiveValue]
g: style.getPropertyValue(-webkit-background-clip) : border-box
g: style.getPropertyCSSValue(-webkit-background-clip) : [object CSSPrimitiveValue]
-g: style.getPropertyValue(-webkit-background-composite) : source-over
-g: style.getPropertyCSSValue(-webkit-background-composite) : [object CSSPrimitiveValue]
g: style.getPropertyValue(-webkit-background-origin) : padding-box
g: style.getPropertyCSSValue(-webkit-background-origin) : [object CSSPrimitiveValue]
g: style.getPropertyValue(-webkit-background-size) : auto
Modified: trunk/Source/WebCore/ChangeLog (287432 => 287433)
--- trunk/Source/WebCore/ChangeLog 2021-12-24 21:39:38 UTC (rev 287432)
+++ trunk/Source/WebCore/ChangeLog 2021-12-24 21:59:50 UTC (rev 287433)
@@ -1,3 +1,29 @@
+2021-12-24 Tim Nguyen <[email protected]>
+
+ Remove non-standard -webkit-background-composite CSS property
+ https://bugs.webkit.org/show_bug.cgi?id=234661
+
+ Reviewed by Simon Fraser.
+
+ 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.
+
2021-12-24 Fujii Hironori <[email protected]>
[Win] MSVC reports "DownloadBundleWin.cpp(87): error C2362: initialization of 'magic' is skipped by 'goto exit'" with /std:c++20
Modified: trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (287432 => 287433)
--- trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2021-12-24 21:39:38 UTC (rev 287432)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2021-12-24 21:59:50 UTC (rev 287433)
@@ -2778,10 +2778,9 @@
list->append(maskModeToCSSValue(currLayer->maskMode()));
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);
auto list = CSSValueList::createCommaSeparated();
Modified: trunk/Source/WebCore/css/CSSProperties.json (287432 => 287433)
--- trunk/Source/WebCore/css/CSSProperties.json 2021-12-24 21:39:38 UTC (rev 287432)
+++ trunk/Source/WebCore/css/CSSProperties.json 2021-12-24 21:59:50 UTC (rev 287433)
@@ -5229,32 +5229,6 @@
"fill-layer-property": true
}
},
- "-webkit-background-composite": {
- "values": [
- "clear",
- "copy",
- "source-over",
- "source-in",
- "source-out",
- "source-atop",
- "destination-over",
- "destination-in",
- "destination-out",
- "destination-atop",
- "xor",
- "plus-darker",
- "highlight",
- "plus-lighter"
- ],
- "codegen-properties": {
- "name-for-methods": "Composite",
- "fill-layer-property": true
- },
- "status": {
- "status": "experimental",
- "comment": "Partially subsumed by background-blend-mode."
- }
- },
"-webkit-background-origin": {
"codegen-properties": {
"name-for-methods": "Origin",
Modified: trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp (287432 => 287433)
--- trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp 2021-12-24 21:39:38 UTC (rev 287432)
+++ trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp 2021-12-24 21:59:50 UTC (rev 287433)
@@ -3160,12 +3160,12 @@
return consumeIdent<CSSValueText, CSSValueWebkitText>(range);
}
-static RefPtr<CSSPrimitiveValue> consumePrefixedBackgroundComposite(CSSParserTokenRange& range)
+static RefPtr<CSSPrimitiveValue> consumePrefixedMaskComposite(CSSParserTokenRange& range)
{
return consumeIdentRange(range, CSSValueClear, CSSValuePlusLighter);
}
-static RefPtr<CSSPrimitiveValue> consumeBackgroundComposite(CSSParserTokenRange& range)
+static RefPtr<CSSPrimitiveValue> consumeMaskComposite(CSSParserTokenRange& range)
{
return consumeIdentRange(range, CSSValueAdd, CSSValueExclude);
}
@@ -3248,10 +3248,9 @@
case CSSPropertyBackgroundOrigin:
return consumeBackgroundBox(range);
case CSSPropertyMaskComposite:
- return consumeBackgroundComposite(range);
+ return consumeMaskComposite(range);
case CSSPropertyWebkitMaskComposite:
- case CSSPropertyWebkitBackgroundComposite:
- return consumePrefixedBackgroundComposite(range);
+ return consumePrefixedMaskComposite(range);
case CSSPropertyWebkitBackgroundClip:
case CSSPropertyWebkitBackgroundOrigin:
case CSSPropertyWebkitMaskClip:
@@ -4569,7 +4568,6 @@
case CSSPropertyBackgroundSize:
case CSSPropertyWebkitBackgroundClip:
case CSSPropertyWebkitBackgroundOrigin:
- case CSSPropertyWebkitBackgroundComposite:
case CSSPropertyWebkitBackgroundSize:
case CSSPropertyMaskClip:
case CSSPropertyWebkitMaskClip:
Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (287432 => 287433)
--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2021-12-24 21:39:38 UTC (rev 287432)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2021-12-24 21:59:50 UTC (rev 287433)
@@ -2663,10 +2663,6 @@
if (hasPerspectiveOrPreserves3D(style))
return false;
- // FIXME: we should be able to allow backgroundComposite; However since this is not a common use case it has been deferred for now.
- if (style.backgroundComposite() != CompositeOperator::SourceOver)
- return false;
-
return true;
}
Modified: trunk/Source/WebCore/rendering/style/RenderStyle.h (287432 => 287433)
--- trunk/Source/WebCore/rendering/style/RenderStyle.h 2021-12-24 21:39:38 UTC (rev 287432)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.h 2021-12-24 21:59:50 UTC (rev 287433)
@@ -416,7 +416,6 @@
FillRepeat backgroundRepeatX() const { return static_cast<FillRepeat>(m_backgroundData->background->repeatX()); }
FillRepeat backgroundRepeatY() const { return static_cast<FillRepeat>(m_backgroundData->background->repeatY()); }
- CompositeOperator backgroundComposite() const { return static_cast<CompositeOperator>(m_backgroundData->background->composite()); }
FillAttachment backgroundAttachment() const { return static_cast<FillAttachment>(m_backgroundData->background->attachment()); }
FillBox backgroundClip() const { return static_cast<FillBox>(m_backgroundData->background->clip()); }
FillBox backgroundOrigin() const { return static_cast<FillBox>(m_backgroundData->background->origin()); }
Modified: trunk/Source/WebInspectorUI/ChangeLog (287432 => 287433)
--- trunk/Source/WebInspectorUI/ChangeLog 2021-12-24 21:39:38 UTC (rev 287432)
+++ trunk/Source/WebInspectorUI/ChangeLog 2021-12-24 21:59:50 UTC (rev 287433)
@@ -1,5 +1,14 @@
2021-12-24 Tim Nguyen <[email protected]>
+ Remove non-standard -webkit-background-composite CSS property
+ https://bugs.webkit.org/show_bug.cgi?id=234661
+
+ Reviewed by Simon Fraser.
+
+ * UserInterface/Models/CSSKeywordCompletions.js:
+
+2021-12-24 Tim Nguyen <[email protected]>
+
Remove non-standard -webkit-margin-collapse CSS property and longhands
https://bugs.webkit.org/show_bug.cgi?id=190788
Modified: trunk/Source/WebInspectorUI/UserInterface/Models/CSSKeywordCompletions.js (287432 => 287433)
--- trunk/Source/WebInspectorUI/UserInterface/Models/CSSKeywordCompletions.js 2021-12-24 21:39:38 UTC (rev 287432)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/CSSKeywordCompletions.js 2021-12-24 21:59:50 UTC (rev 287433)
@@ -933,9 +933,6 @@
"scroll-snap-type": [
"none", "mandatory", "proximity", "x", "y", "inline", "block", "both"
],
- "-webkit-background-composite": [
- "clear", "copy", "source-over", "source-in", "source-out", "source-atop", "destination-over", "destination-in", "destination-out", "destination-atop", "xor", "plus-darker", "plus-lighter"
- ],
"-webkit-mask-composite": [
"clear", "copy", "source-over", "source-in", "source-out", "source-atop", "destination-over", "destination-in", "destination-out", "destination-atop", "xor", "plus-darker", "plus-lighter"
],
