229c6aafb3
Requires https://github.com/servo/servo/pull/19895 We use Size2D and Point2D across compositing, constellation and script, loosing the type of pixels we use (DevicePixel, DeviceIndepententPixel or CSSPixel) along the way, which might lead to bugs like `window.outerHeight` not taking into account the page zoom (using DeviceIndepententPixel instead of CSSPixel). This should make the situation a bit better. --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [ ] These changes fix #__ (github issue number if applicable). <!-- Either: --> - [ ] There are tests for these changes OR - [x] These changes do not require tests because we can't zoom in a test <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> Source-Repo: https://github.com/servo/servo Source-Revision: fc90e613d8851b663e3304d713b2ca08aa397bf4
90 lines
3.0 KiB
Rust
90 lines
3.0 KiB
Rust
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
use dom::bindings::codegen::Bindings::ScreenBinding;
|
|
use dom::bindings::codegen::Bindings::ScreenBinding::ScreenMethods;
|
|
use dom::bindings::inheritance::Castable;
|
|
use dom::bindings::num::Finite;
|
|
use dom::bindings::reflector::{Reflector, reflect_dom_object};
|
|
use dom::bindings::root::{Dom, DomRoot};
|
|
use dom::globalscope::GlobalScope;
|
|
use dom::window::Window;
|
|
use dom_struct::dom_struct;
|
|
use euclid::TypedSize2D;
|
|
use ipc_channel::ipc;
|
|
use script_traits::ScriptMsg;
|
|
use style_traits::CSSPixel;
|
|
use webrender_api::DeviceUintSize;
|
|
|
|
#[dom_struct]
|
|
pub struct Screen {
|
|
reflector_: Reflector,
|
|
window: Dom<Window>,
|
|
}
|
|
|
|
impl Screen {
|
|
fn new_inherited(window: &Window) -> Screen {
|
|
Screen {
|
|
reflector_: Reflector::new(),
|
|
window: Dom::from_ref(&window),
|
|
}
|
|
}
|
|
|
|
pub fn new(window: &Window) -> DomRoot<Screen> {
|
|
reflect_dom_object(Box::new(Screen::new_inherited(window)),
|
|
window,
|
|
ScreenBinding::Wrap)
|
|
}
|
|
|
|
fn screen_size(&self) -> TypedSize2D<u32, CSSPixel> {
|
|
let (send, recv) = ipc::channel::<DeviceUintSize>().unwrap();
|
|
self.window.upcast::<GlobalScope>()
|
|
.script_to_constellation_chan().send(ScriptMsg::GetScreenSize(send)).unwrap();
|
|
let dpr = self.window.device_pixel_ratio();
|
|
let screen = recv.recv().unwrap_or(TypedSize2D::zero());
|
|
(screen.to_f32() / dpr).to_u32()
|
|
}
|
|
|
|
fn screen_avail_size(&self) -> TypedSize2D<u32, CSSPixel> {
|
|
let (send, recv) = ipc::channel::<DeviceUintSize>().unwrap();
|
|
self.window.upcast::<GlobalScope>()
|
|
.script_to_constellation_chan().send(ScriptMsg::GetScreenAvailSize(send)).unwrap();
|
|
let dpr = self.window.device_pixel_ratio();
|
|
let screen = recv.recv().unwrap_or(TypedSize2D::zero());
|
|
(screen.to_f32() / dpr).to_u32()
|
|
}
|
|
}
|
|
|
|
impl ScreenMethods for Screen {
|
|
// https://drafts.csswg.org/cssom-view/#dom-screen-availwidth
|
|
fn AvailWidth(&self) -> Finite<f64> {
|
|
Finite::wrap(self.screen_avail_size().width as f64)
|
|
}
|
|
|
|
// https://drafts.csswg.org/cssom-view/#dom-screen-availheight
|
|
fn AvailHeight(&self) -> Finite<f64> {
|
|
Finite::wrap(self.screen_avail_size().height as f64)
|
|
}
|
|
|
|
// https://drafts.csswg.org/cssom-view/#dom-screen-width
|
|
fn Width(&self) -> Finite<f64> {
|
|
Finite::wrap(self.screen_size().width as f64)
|
|
}
|
|
|
|
// https://drafts.csswg.org/cssom-view/#dom-screen-height
|
|
fn Height(&self) -> Finite<f64> {
|
|
Finite::wrap(self.screen_size().height as f64)
|
|
}
|
|
|
|
// https://drafts.csswg.org/cssom-view/#dom-screen-colordepth
|
|
fn ColorDepth(&self) -> u32 {
|
|
24
|
|
}
|
|
|
|
// https://drafts.csswg.org/cssom-view/#dom-screen-pixeldepth
|
|
fn PixelDepth(&self) -> u32 {
|
|
24
|
|
}
|
|
}
|