aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/mediaquerylist.rs
diff options
context:
space:
mode:
Diffstat (limited to 'components/script/dom/mediaquerylist.rs')
-rw-r--r--components/script/dom/mediaquerylist.rs11
1 files changed, 3 insertions, 8 deletions
diff --git a/components/script/dom/mediaquerylist.rs b/components/script/dom/mediaquerylist.rs
index 60cb875163e..199241b14dd 100644
--- a/components/script/dom/mediaquerylist.rs
+++ b/components/script/dom/mediaquerylist.rs
@@ -22,7 +22,7 @@ use dom_struct::dom_struct;
use js::jsapi::JSTracer;
use std::cell::Cell;
use std::rc::Rc;
-use style::media_queries::{Device, MediaList, MediaType};
+use style::media_queries::MediaList;
use style_traits::ToCss;
pub enum MediaQueryListMatchState {
@@ -74,14 +74,9 @@ impl MediaQueryList {
}
pub fn evaluate(&self) -> bool {
- if let Some(window_size) = self.document.window().window_size() {
- let viewport_size = window_size.initial_viewport;
- let device_pixel_ratio = window_size.device_pixel_ratio;
- let device = Device::new(MediaType::screen(), viewport_size, device_pixel_ratio);
+ self.document.device().map_or(false, |device| {
self.media_query_list.evaluate(&device, self.document.quirks_mode())
- } else {
- false
- }
+ })
}
}