Re-add 'style' to contain:strict and contain:content CSS properties

• Component: CSS
• Status: RESOLVED FIXED

[Rob Buis]

Re-add 'style' to contain:strict and contain:content CSS properties.

[Rob Buis]

This is fixed in the spec, implemented in chromium and Firefox has verbally agreed to do it as well:
https://groups.google.com/a/chromium.org/g/blink-dev/c/oMVBKemrTDQ?pli=1

[Rob Buis]

Created attachment 444411 [details]
Patch

[Rob Buis]

Created attachment 444436 [details]
Patch

[Radar WebKit Bug Importer]

<rdar://problem/85478069>

[Brent Fulgham]

Comment on attachment 444436 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=444436&action=review

r=me

> Source/WebCore/ChangeLog:9
> +        The chsange was done in chromium and Firefox has verbally agreed to make the change as well [3].

Nit: change

[Rob Buis]

Created attachment 444482 [details]
Patch

[EWS]

Committed r285918 (244327@main): <https://commits.webkit.org/244327@main>

All reviewed patches have been landed. Closing bug and clearing flags on attachment 444482 [details].

[Darin Adler]

Comment on attachment 444482 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=444482&action=review

> Source/WebCore/rendering/style/RenderStyle.h:1673
>      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 }; }

Not sure we have to name the OptionSet type twice. I think we can just use braces inside the function without naming the type?

[Rob Buis]

Comment on attachment 444482 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=444482&action=review

>> Source/WebCore/rendering/style/RenderStyle.h:1673
>> +    static OptionSet<Containment> contentContainment() { return OptionSet<Containment> { Containment::Layout, Containment::Paint, Containment::Style }; }
> 
> Not sure we have to name the OptionSet type twice. I think we can just use braces inside the function without naming the type?

I had that change locally but wanted to keep the patch simple. Note that methods in RenderStyle returning OptionSet do this inconsistently already before my patch. Maybe somebody can make it consistent.

[Darin Adler]

(In reply to Rob Buis from comment #9)
> Maybe somebody can make it consistent.

As you probably know, this is the kind of thing I often do.