diff options
Diffstat (limited to 'components/script/dom/mediaquerylist.rs')
| -rw-r--r-- | components/script/dom/mediaquerylist.rs | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/components/script/dom/mediaquerylist.rs b/components/script/dom/mediaquerylist.rs index 2545b911c7a..486f9f64fd3 100644 --- a/components/script/dom/mediaquerylist.rs +++ b/components/script/dom/mediaquerylist.rs @@ -18,12 +18,11 @@ use dom::document::Document; use dom::event::Event; use dom::eventtarget::EventTarget; use dom::mediaquerylistevent::MediaQueryListEvent; -use euclid::scale_factor::ScaleFactor; use js::jsapi::JSTracer; use std::cell::Cell; use std::rc::Rc; use style::media_queries::{Device, MediaList, MediaType}; -use style_traits::{PagePx, ToCss, ViewportPx}; +use style_traits::ToCss; pub enum MediaQueryListMatchState { Same(bool), @@ -75,12 +74,8 @@ impl MediaQueryList { pub fn evaluate(&self) -> bool { if let Some(window_size) = self.document.window().window_size() { - let viewport_size = window_size.visible_viewport; - // TODO: support real ViewportPx, including zoom level - // This information seems not to be tracked currently, so we assume - // ViewportPx == PagePx - let page_to_viewport: ScaleFactor<f32, PagePx, ViewportPx> = ScaleFactor::new(1.0); - let device = Device::new(MediaType::Screen, viewport_size * page_to_viewport); + let viewport_size = window_size.initial_viewport; + let device = Device::new(MediaType::Screen, viewport_size); self.media_query_list.evaluate(&device) } else { false |