From 16cfd018230ca273d256963fdb66851670228d07 Mon Sep 17 00:00:00 2001
From: Oriol Brufau <obrufau@igalia.com>
Date: Fri, 11 Aug 2023 14:39:17 +0200
Subject: [PATCH] Further changes required by Servo

---
 components/atoms/static_atoms.txt              | 5 +++++
 components/style/queries/feature_expression.rs | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/components/atoms/static_atoms.txt b/components/atoms/static_atoms.txt
index c7513660cfe..9ef4e7c5f94 100644
--- a/components/atoms/static_atoms.txt
+++ b/components/atoms/static_atoms.txt
@@ -13,7 +13,9 @@ animationcancel
 animationend
 animationiteration
 animationstart
+aspect-ratio
 beforeunload
+block-size
 button
 canplay
 canplaythrough
@@ -51,11 +53,13 @@ fullscreenchange
 fullscreenerror
 gattserverdisconnected
 hashchange
+height
 hidden
 icecandidate
 iceconnectionstatechange
 icegatheringstatechange
 image
+inline-size
 input
 inputsourceschange
 invalid
@@ -83,6 +87,7 @@ none
 number
 onchange
 open
+orientation
 pagehide
 pageshow
 password
diff --git a/components/style/queries/feature_expression.rs b/components/style/queries/feature_expression.rs
index cfc2df41370..13729d96118 100644
--- a/components/style/queries/feature_expression.rs
+++ b/components/style/queries/feature_expression.rs
@@ -30,14 +30,14 @@ pub enum FeatureType {
 impl FeatureType {
     fn features(&self) -> &'static [QueryFeatureDescription] {
         #[cfg(feature = "gecko")]
-        use crate::gecko::media_features::MEDIA_FEATURES;
+        let media_features = &crate::gecko::media_features::MEDIA_FEATURES;
         #[cfg(feature = "servo")]
-        use crate::servo::media_queries::MEDIA_FEATURES;
+        let media_features = &*crate::servo::media_queries::MEDIA_FEATURES;
 
         use crate::stylesheets::container_rule::CONTAINER_FEATURES;
 
         match *self {
-            FeatureType::Media => &MEDIA_FEATURES,
+            FeatureType::Media => media_features,
             FeatureType::Container => &CONTAINER_FEATURES,
         }
     }