Title: [285918] trunk
- Revision
- 285918
- Author
- [email protected]
- Date
- 2021-11-16 23:54:59 -0800 (Tue, 16 Nov 2021)
Log Message
Re-add 'style' to contain:strict and contain:content CSS properties
https://bugs.webkit.org/show_bug.cgi?id=233193
Patch by Rob Buis <[email protected]> on 2021-11-16
Reviewed by Brent Fulgham.
LayoutTests/imported/w3c:
Now contain-computed-expected.txt is all PASS.
* web-platform-tests/css/css-contain/parsing/contain-computed-expected.txt:
Source/WebCore:
After being removed for a while, style containment is part again of contain:strict and contain: content [1, 2].
The change was done in chromium and Firefox has verbally agreed to make the change as well [3].
[1] https://github.com/w3c/csswg-drafts/issues/6287#issuecomment-862525199
[2] https://github.com/w3c/csswg-drafts/commit/7948feb03a9aaceb3a8ee423b07c6e526024cdc2
[3] https://groups.google.com/a/chromium.org/g/blink-dev/c/oMVBKemrTDQ?pli=1
* rendering/style/RenderStyle.h:
(WebCore::RenderStyle::strictContainment):
(WebCore::RenderStyle::contentContainment):
LayoutTests:
* TestExpectations:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (285917 => 285918)
--- trunk/LayoutTests/ChangeLog 2021-11-17 06:25:17 UTC (rev 285917)
+++ trunk/LayoutTests/ChangeLog 2021-11-17 07:54:59 UTC (rev 285918)
@@ -1,3 +1,12 @@
+2021-11-16 Rob Buis <[email protected]>
+
+ Re-add 'style' to contain:strict and contain:content CSS properties
+ https://bugs.webkit.org/show_bug.cgi?id=233193
+
+ Reviewed by Brent Fulgham.
+
+ * TestExpectations:
+
2021-11-16 Simon Fraser <[email protected]>
Stop a momentum scroll animation when receiving a momentum end event
Modified: trunk/LayoutTests/TestExpectations (285917 => 285918)
--- trunk/LayoutTests/TestExpectations 2021-11-17 06:25:17 UTC (rev 285917)
+++ trunk/LayoutTests/TestExpectations 2021-11-17 07:54:59 UTC (rev 285918)
@@ -4796,7 +4796,6 @@
imported/w3c/web-platform-tests/css/css-contain/contain-body-w-m-002.html [ ImageOnlyFailure ]
imported/w3c/web-platform-tests/css/css-contain/contain-body-w-m-003.html [ ImageOnlyFailure ]
imported/w3c/web-platform-tests/css/css-contain/contain-body-w-m-004.html [ ImageOnlyFailure ]
-imported/w3c/web-platform-tests/css/css-contain/contain-content-011.html [ ImageOnlyFailure ]
imported/w3c/web-platform-tests/css/css-contain/contain-html-bg-001.html [ ImageOnlyFailure ]
imported/w3c/web-platform-tests/css/css-contain/contain-html-bg-002.html [ ImageOnlyFailure ]
imported/w3c/web-platform-tests/css/css-contain/contain-html-bg-003.html [ ImageOnlyFailure ]
Modified: trunk/LayoutTests/imported/w3c/ChangeLog (285917 => 285918)
--- trunk/LayoutTests/imported/w3c/ChangeLog 2021-11-17 06:25:17 UTC (rev 285917)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2021-11-17 07:54:59 UTC (rev 285918)
@@ -1,3 +1,14 @@
+2021-11-16 Rob Buis <[email protected]>
+
+ Re-add 'style' to contain:strict and contain:content CSS properties
+ https://bugs.webkit.org/show_bug.cgi?id=233193
+
+ Reviewed by Brent Fulgham.
+
+ Now contain-computed-expected.txt is all PASS.
+
+ * web-platform-tests/css/css-contain/parsing/contain-computed-expected.txt:
+
2021-11-16 Joonghun Park <[email protected]>
border-radius inline style should serialize with valid syntax
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/parsing/contain-computed-expected.txt (285917 => 285918)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/parsing/contain-computed-expected.txt 2021-11-17 06:25:17 UTC (rev 285917)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/parsing/contain-computed-expected.txt 2021-11-17 07:54:59 UTC (rev 285918)
@@ -8,8 +8,8 @@
PASS Property contain value 'paint'
PASS Property contain value 'size layout'
PASS Property contain value 'style paint'
-FAIL Property contain value 'style layout paint' assert_equals: expected "content" but got "layout style paint"
-FAIL Property contain value 'size style layout paint' assert_equals: expected "strict" but got "size layout style paint"
-FAIL Property contain value 'size layout paint' assert_equals: expected "size layout paint" but got "strict"
-FAIL Property contain value 'layout paint' assert_equals: expected "layout paint" but got "content"
+PASS Property contain value 'style layout paint'
+PASS Property contain value 'size style layout paint'
+PASS Property contain value 'size layout paint'
+PASS Property contain value 'layout paint'
Modified: trunk/Source/WebCore/ChangeLog (285917 => 285918)
--- trunk/Source/WebCore/ChangeLog 2021-11-17 06:25:17 UTC (rev 285917)
+++ trunk/Source/WebCore/ChangeLog 2021-11-17 07:54:59 UTC (rev 285918)
@@ -1,3 +1,21 @@
+2021-11-16 Rob Buis <[email protected]>
+
+ Re-add 'style' to contain:strict and contain:content CSS properties
+ https://bugs.webkit.org/show_bug.cgi?id=233193
+
+ Reviewed by Brent Fulgham.
+
+ After being removed for a while, style containment is part again of contain:strict and contain: content [1, 2].
+ The change was done in chromium and Firefox has verbally agreed to make the change as well [3].
+
+ [1] https://github.com/w3c/csswg-drafts/issues/6287#issuecomment-862525199
+ [2] https://github.com/w3c/csswg-drafts/commit/7948feb03a9aaceb3a8ee423b07c6e526024cdc2
+ [3] https://groups.google.com/a/chromium.org/g/blink-dev/c/oMVBKemrTDQ?pli=1
+
+ * rendering/style/RenderStyle.h:
+ (WebCore::RenderStyle::strictContainment):
+ (WebCore::RenderStyle::contentContainment):
+
2021-11-16 Simon Fraser <[email protected]>
Stop a momentum scroll animation when receiving a momentum end event
Modified: trunk/Source/WebCore/rendering/style/RenderStyle.h (285917 => 285918)
--- trunk/Source/WebCore/rendering/style/RenderStyle.h 2021-11-17 06:25:17 UTC (rev 285917)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.h 2021-11-17 07:54:59 UTC (rev 285918)
@@ -1669,8 +1669,8 @@
static ControlPart initialAppearance() { return NoControlPart; }
static AspectRatioType initialAspectRatioType() { return AspectRatioType::Auto; }
static OptionSet<Containment> initialContainment() { return OptionSet<Containment> { }; }
- static OptionSet<Containment> strictContainment() { return OptionSet<Containment> { Containment::Size, Containment::Layout, Containment::Paint }; }
- static OptionSet<Containment> contentContainment() { return OptionSet<Containment> { Containment::Layout, Containment::Paint }; }
+ static OptionSet<Containment> strictContainment() { return OptionSet<Containment> { Containment::Size, Containment::Layout, Containment::Paint, Containment::Style }; }
+ static OptionSet<Containment> contentContainment() { return OptionSet<Containment> { Containment::Layout, Containment::Paint, Containment::Style }; }
static double initialAspectRatioWidth() { return 1.0; }
static double initialAspectRatioHeight() { return 1.0; }
static Order initialRTLOrdering() { return Order::Logical; }
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
