Attachment 460413 Details for Bug 241852 – Patch

[patch] Patch

bug-241852-20220622152354.patch (text/plain), 3.36 KB, created by Antti Koivisto on 2022-06-22 05:23:55 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Antti Koivisto

Created: 2022-06-22 05:23:55 PDT

Size: 3.36 KB

patch

obsolete

>From 420cbaf49f2fe401c89c34d8995bd7a92015b20c Mon Sep 17 00:00:00 2001
>From: Antti Koivisto <antti@apple.com>
>Date: Wed, 22 Jun 2022 15:22:01 +0300
>Subject: [PATCH] [CSS Container Queries] rem units don't work in queries
> https://bugs.webkit.org/show_bug.cgi?id=241852
>
>Reviewed by NOBODY (OOPS!).
>
>* LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/font-relative-units-dynamic-expected.txt:
>* LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/font-relative-units-expected.txt:
>* Source/WebCore/style/ContainerQueryEvaluator.cpp:
>(WebCore::Style::ContainerQueryEvaluator::selectContainer const):
>
>Correctly pass the document element style instead of the view style.
>---
> Source/WebCore/style/ContainerQueryEvaluator.cpp               | 3 +--
> .../container-queries/font-relative-units-dynamic-expected.txt | 2 +-
> .../container-queries/font-relative-units-expected.txt         | 2 +-
> 3 files changed, 3 insertions(+), 4 deletions(-)
>
>diff --git a/Source/WebCore/style/ContainerQueryEvaluator.cpp b/Source/WebCore/style/ContainerQueryEvaluator.cpp
>index bdff3b7c98d1..9c6de6887564 100644
>--- a/Source/WebCore/style/ContainerQueryEvaluator.cpp
>+++ b/Source/WebCore/style/ContainerQueryEvaluator.cpp
>@@ -73,10 +73,9 @@ auto ContainerQueryEvaluator::selectContainer(const FilteredContainerQuery& filt
>         auto* renderer = dynamicDowncast<RenderBox>(element.renderer());
>         if (!renderer)
>             return { };
>-        auto& view = renderer->view();
>         return {
>             renderer,
>-            CSSToLengthConversionData { renderer->style(), &view.style(), nullptr, &view }
>+            CSSToLengthConversionData { renderer->style(), element.document().documentElement()->renderStyle(), nullptr, &renderer->view() }
>         };
>     };
> 
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/font-relative-units-dynamic-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/font-relative-units-dynamic-expected.txt
>index d2fe88af2c2c..e5f224ee6f1e 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/font-relative-units-dynamic-expected.txt
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/font-relative-units-dynamic-expected.txt
>@@ -4,7 +4,7 @@ PASS rem relative before change
> PASS ex relative before change
> PASS ch relative before change
> PASS em relative after change
>-FAIL rem relative after change assert_equals: expected "rgb(0, 128, 0)" but got "rgb(255, 0, 0)"
>+PASS rem relative after change
> PASS ex relative after change
> PASS ch relative after change
> 
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/font-relative-units-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/font-relative-units-expected.txt
>index 821dd79e1c57..0a090197385d 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/font-relative-units-expected.txt
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/font-relative-units-expected.txt
>@@ -1,6 +1,6 @@
> 
> PASS em relative inline-size
>-FAIL rem relative inline-size assert_equals: expected "rgb(0, 128, 0)" but got "rgb(0, 0, 0)"
>+PASS rem relative inline-size
> PASS ex relative inline-size
> PASS ch relative inline-size
>

Actions: View | Formatted Diff | Diff

Attachments on bug 241852: 460413