Title: [295729] trunk
Revision
295729
Author
[email protected]
Date
2022-06-22 06:40:19 -0700 (Wed, 22 Jun 2022)

Log Message

[CSS Container Queries] rem units don't work in queries
https://bugs.webkit.org/show_bug.cgi?id=241852

Reviewed by Antoine Quint.

* 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.

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

Modified Paths

Diff

Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/font-relative-units-dynamic-expected.txt (295728 => 295729)


--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/font-relative-units-dynamic-expected.txt	2022-06-22 13:36:56 UTC (rev 295728)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/font-relative-units-dynamic-expected.txt	2022-06-22 13:40:19 UTC (rev 295729)
@@ -4,7 +4,7 @@
 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
 

Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/font-relative-units-expected.txt (295728 => 295729)


--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/font-relative-units-expected.txt	2022-06-22 13:36:56 UTC (rev 295728)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/font-relative-units-expected.txt	2022-06-22 13:40:19 UTC (rev 295729)
@@ -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
 

Modified: trunk/Source/WebCore/style/ContainerQueryEvaluator.cpp (295728 => 295729)


--- trunk/Source/WebCore/style/ContainerQueryEvaluator.cpp	2022-06-22 13:36:56 UTC (rev 295728)
+++ trunk/Source/WebCore/style/ContainerQueryEvaluator.cpp	2022-06-22 13:40:19 UTC (rev 295729)
@@ -73,10 +73,9 @@
         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() }
         };
     };
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to