Changeset 285918 in webkit


Ignore:
Timestamp:
Nov 16, 2021, 11:54:59 PM (4 years ago)
Author:
commit-queue@webkit.org
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 <​rbuis@igalia.com> 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:

Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r285917 r285918  
     12021-11-16  Rob Buis  <rbuis@igalia.com>
     2
     3        Re-add 'style' to contain:strict and contain:content CSS properties
     4        https://bugs.webkit.org/show_bug.cgi?id=233193
     5
     6        Reviewed by Brent Fulgham.
     7
     8        * TestExpectations:
     9
    1102021-11-16  Simon Fraser  <simon.fraser@apple.com>
    211

  • trunk/LayoutTests/TestExpectations

    r285885 r285918  
    47974797imported/w3c/web-platform-tests/css/css-contain/contain-body-w-m-003.html [ ImageOnlyFailure ]
    47984798imported/w3c/web-platform-tests/css/css-contain/contain-body-w-m-004.html [ ImageOnlyFailure ]
    4799 imported/w3c/web-platform-tests/css/css-contain/contain-content-011.html [ ImageOnlyFailure ]
    48004799imported/w3c/web-platform-tests/css/css-contain/contain-html-bg-001.html [ ImageOnlyFailure ]
    48014800imported/w3c/web-platform-tests/css/css-contain/contain-html-bg-002.html [ ImageOnlyFailure ]

  • trunk/LayoutTests/imported/w3c/ChangeLog

    r285915 r285918  
     12021-11-16  Rob Buis  <rbuis@igalia.com>
     2
     3        Re-add 'style' to contain:strict and contain:content CSS properties
     4        https://bugs.webkit.org/show_bug.cgi?id=233193
     5
     6        Reviewed by Brent Fulgham.
     7
     8        Now contain-computed-expected.txt is all PASS.
     9
     10        * web-platform-tests/css/css-contain/parsing/contain-computed-expected.txt:
     11
    1122021-11-16  Joonghun Park  <jh718.park@samsung.com>
    213

  • trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/parsing/contain-computed-expected.txt

    r285803 r285918  
    99PASS Property contain value 'size layout'
    1010PASS Property contain value 'style paint'
    11 FAIL Property contain value 'style layout paint' assert_equals: expected "content" but got "layout style paint"
    12 FAIL Property contain value 'size style layout paint' assert_equals: expected "strict" but got "size layout style paint"
    13 FAIL Property contain value 'size layout paint' assert_equals: expected "size layout paint" but got "strict"
    14 FAIL Property contain value 'layout paint' assert_equals: expected "layout paint" but got "content"
     11PASS Property contain value 'style layout paint'
     12PASS Property contain value 'size style layout paint'
     13PASS Property contain value 'size layout paint'
     14PASS Property contain value 'layout paint'
    1515

  • trunk/Source/WebCore/ChangeLog

    r285917 r285918  
     12021-11-16  Rob Buis  <rbuis@igalia.com>
     2
     3        Re-add 'style' to contain:strict and contain:content CSS properties
     4        https://bugs.webkit.org/show_bug.cgi?id=233193
     5
     6        Reviewed by Brent Fulgham.
     7
     8        After being removed for a while, style containment is part again of contain:strict and contain: content [1, 2].
     9        The change was done in chromium and Firefox has verbally agreed to make the change as well [3].
     10
     11        [1] https://github.com/w3c/csswg-drafts/issues/6287#issuecomment-862525199
     12        [2] https://github.com/w3c/csswg-drafts/commit/7948feb03a9aaceb3a8ee423b07c6e526024cdc2
     13        [3] https://groups.google.com/a/chromium.org/g/blink-dev/c/oMVBKemrTDQ?pli=1
     14
     15        * rendering/style/RenderStyle.h:
     16        (WebCore::RenderStyle::strictContainment):
     17        (WebCore::RenderStyle::contentContainment):
     18
    1192021-11-16  Simon Fraser  <simon.fraser@apple.com>
    220

  • trunk/Source/WebCore/rendering/style/RenderStyle.h

    r285904 r285918  
    16701670    static AspectRatioType initialAspectRatioType() { return AspectRatioType::Auto; }
    16711671    static OptionSet<Containment> initialContainment() { return OptionSet<Containment> { }; }
    1672     static OptionSet<Containment> strictContainment() { return OptionSet<Containment> { Containment::Size, Containment::Layout, Containment::Paint }; }
    1673     static OptionSet<Containment> contentContainment() { return OptionSet<Containment> { Containment::Layout, Containment::Paint }; }
     1672    static OptionSet<Containment> strictContainment() { return OptionSet<Containment> { Containment::Size, Containment::Layout, Containment::Paint, Containment::Style }; }
     1673    static OptionSet<Containment> contentContainment() { return OptionSet<Containment> { Containment::Layout, Containment::Paint, Containment::Style }; }
    16741674    static double initialAspectRatioWidth() { return 1.0; }
    16751675    static double initialAspectRatioHeight() { return 1.0; }
Note: See TracChangeset for help on using the changeset viewer.