From ea04827f05296959f0ad0fa2c0f89c2e4211b4ce Mon Sep 17 00:00:00 2001 From: Ziran Sun Date: Wed, 23 Nov 2022 14:51:49 +0000 Subject: [PATCH] style: Use root element font size for rem calculation in Container queries Differential Revision: https://phabricator.services.mozilla.com/D162853 --- components/style/values/computed/mod.rs | 2 +- components/style/values/specified/length.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/style/values/computed/mod.rs b/components/style/values/computed/mod.rs index 1d40275db80..de5c1e5a374 100644 --- a/components/style/values/computed/mod.rs +++ b/components/style/values/computed/mod.rs @@ -218,7 +218,7 @@ impl<'a> Context<'a> { builder: StyleBuilder::for_inheritance(device, None, None), cached_system_font: None, in_media_query: true, - in_container_query: true, + in_container_query: false, quirks_mode, for_smil_animation: false, container_info: None, diff --git a/components/style/values/specified/length.rs b/components/style/values/specified/length.rs index 979a910509f..ea96ef7426e 100644 --- a/components/style/values/specified/length.rs +++ b/components/style/values/specified/length.rs @@ -258,7 +258,7 @@ impl FontRelativeLength { // element, the rem units refer to the property's initial // value. // - let reference_size = if context.builder.is_root_element || context.in_media_or_container_query() { + let reference_size = if context.builder.is_root_element || context.in_media_query { reference_font_size } else { context.device().root_font_size()