Revert "Add device-width/device-height media features." (#394)

Reverts #368

More work is required in Servo to integrate this.

Author: jdm

style/device/servo.rs

@@ -56,8 +56,6 @@ pub(super) struct ExtraDeviceData {
     media_type: MediaType,
     /// The current viewport size, in CSS pixels.
     viewport_size: Size2D<f32, CSSPixel>,
-    /// The current screen size, in device pixels.
-    device_size: Size2D<f32, DevicePixel>,
     /// The current device pixel ratio, from CSS pixels to device pixels.
     device_pixel_ratio: Scale<f32, CSSPixel, DevicePixel>,
     /// The current quirks mode.
@@ -77,7 +75,6 @@ impl Device {
         media_type: MediaType,
         quirks_mode: QuirksMode,
         viewport_size: Size2D<f32, CSSPixel>,
-        device_size: Size2D<f32, DevicePixel>,
         device_pixel_ratio: Scale<f32, CSSPixel, DevicePixel>,
         font_metrics_provider: Box<dyn FontMetricsProvider>,
         default_values: Arc<ComputedValues>,
@@ -104,7 +101,6 @@ impl Device {
             extra: ExtraDeviceData {
                 media_type,
                 viewport_size,
-                device_size,
                 device_pixel_ratio,
                 quirks_mode,
                 prefers_color_scheme,
@@ -211,21 +207,6 @@ impl Device {
         self.extra.device_pixel_ratio = device_pixel_ratio;
     }
 
-    /// Set the device size on this [`Device`] (e.g. the available screen dimensions).
-    ///
-    /// Note that this does not update any associated `Stylist`. For this you must call
-    /// `Stylist::media_features_change_changed_style` and
-    /// `Stylist::force_stylesheet_origins_dirty`.
-    pub fn set_device_size(&mut self, device_size: Size2D<f32, DevicePixel>) {
-        self.extra.device_size = device_size;
-    }
-
-    /// Returns the screen size of the current device in app units.
-    #[inline]
-    pub fn device_size(&self) -> Size2D<f32, DevicePixel> {
-        self.extra.device_size
-    }
-
     /// Gets the size of the scrollbar in CSS pixels.
     pub fn scrollbar_inline_size(&self) -> CSSPixelLength {
         // TODO: implement this.

style/servo/media_features.rs

@@ -15,20 +15,6 @@ fn eval_width(context: &Context) -> CSSPixelLength {
     CSSPixelLength::new(context.device().au_viewport_size().width.to_f32_px())
 }
 
-/// https://drafts.csswg.org/mediaqueries-4/#device-width
-fn eval_device_width(context: &Context) -> CSSPixelLength {
-    let device = context.device();
-    let scaled = device.device_size() / device.device_pixel_ratio();
-     CSSPixelLength::new(scaled.width)
-}
-
-/// https://drafts.csswg.org/mediaqueries-4/#device-height
-fn eval_device_height(context: &Context) -> CSSPixelLength {
-    let device = context.device();
-    let scaled = device.device_size() / device.device_pixel_ratio();
-    CSSPixelLength::new(scaled.height)
-}
-
 #[derive(Clone, Copy, Debug, FromPrimitive, Parse, ToCss)]
 #[repr(u8)]
 enum Scan {
@@ -61,25 +47,13 @@ fn eval_prefers_color_scheme(context: &Context, query_value: Option<PrefersColor
 }
 
 /// A list with all the media features that Servo supports.
-pub static MEDIA_FEATURES: [QueryFeatureDescription; 8] = [
+pub static MEDIA_FEATURES: [QueryFeatureDescription; 6] = [
     feature!(
         atom!("width"),
         AllowsRanges::Yes,
         Evaluator::Length(eval_width),
         FeatureFlags::empty(),
     ),
-    feature!(
-        atom!("device-width"),
-        AllowsRanges::Yes,
-        Evaluator::Length(eval_device_width),
-        FeatureFlags::empty(),
-    ),
-    feature!(
-        atom!("device-height"),
-        AllowsRanges::Yes,
-        Evaluator::Length(eval_device_height),
-        FeatureFlags::empty(),
-    ),
     feature!(
         atom!("scan"),
         AllowsRanges::No,

stylo_atoms/static_atoms.txt

@@ -49,9 +49,7 @@ datachannel
 date
 datetime-local
 dir
-device-height
 device-pixel-ratio
-device-width
 durationchange
 email
 emptied