[webkit-changes] [WebKit/WebKit] a3419e: [CSS Container Queries] container-name should use ...

Antti Koivisto noreply at github.com
Tue Aug 22 17:03:16 PDT 2023


  Branch: refs/heads/main
  Home:   https://github.com/WebKit/WebKit
  Commit: a3419ecd9755d890a3cb3eed1a521c627674f82a
      https://github.com/WebKit/WebKit/commit/a3419ecd9755d890a3cb3eed1a521c627674f82a
  Author: Antti Koivisto <antti at apple.com>
  Date:   2023-08-22 (Tue, 22 Aug 2023)

  Changed paths:
    M LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/container-name-tree-scoped-expected.txt
    M Source/WebCore/css/CSSToStyleMap.cpp
    M Source/WebCore/css/ComputedStyleExtractor.cpp
    M Source/WebCore/rendering/style/RenderStyle.h
    M Source/WebCore/rendering/style/RenderStyleInlines.h
    M Source/WebCore/rendering/style/RenderStyleSetters.h
    M Source/WebCore/rendering/style/StyleRareNonInheritedData.h
    M Source/WebCore/style/ContainerQueryEvaluator.cpp
    M Source/WebCore/style/ScopedName.h
    M Source/WebCore/style/StyleBuilderConverter.h

  Log Message:
  -----------
  [CSS Container Queries] container-name should use scoped names
https://bugs.webkit.org/show_bug.cgi?id=260522
rdar://problem/114284428

Reviewed by Alan Baradlay.

Container names from inner scopes should be ignored.

* LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/container-name-tree-scoped-expected.txt:
* Source/WebCore/css/CSSToStyleMap.cpp:
(WebCore::CSSToStyleMap::mapAnimationName):
* Source/WebCore/css/ComputedStyleExtractor.cpp:
(WebCore::ComputedStyleExtractor::valueForPropertyInStyle const):
* Source/WebCore/rendering/style/RenderStyle.h:
* Source/WebCore/rendering/style/RenderStyleInlines.h:
(WebCore::RenderStyle::containerNames const):

Switch to use Style::ScopedName instead of a plain string.

(WebCore::RenderStyle::initialContainerNames):
* Source/WebCore/rendering/style/RenderStyleSetters.h:
(WebCore::RenderStyle::setContainerNames):
* Source/WebCore/rendering/style/StyleRareNonInheritedData.h:
* Source/WebCore/style/ContainerQueryEvaluator.cpp:
(WebCore::Style::ContainerQueryEvaluator::selectContainer):

Ignore names from scopes inner than what is currently being evaluated when selecting the container.

* Source/WebCore/style/ScopedName.h:
* Source/WebCore/style/StyleBuilderConverter.h:
(WebCore::Style::BuilderConverter::convertContainerName):

Canonical link: https://commits.webkit.org/267163@main




More information about the webkit-changes mailing list