Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 12:40:06 +01:00
Code Issues Projects Releases Packages Wiki Activity

remove WindowMethods::size()

Browse source
This commit is contained in:
Paul Rouget 2018-03-16 14:58:17 +08:00
parent e25dd45139
commit fef0506269
2 changed files with 2 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/compositing/windowing.rs
View file

@ -17,7 +17,7 @@ use std::fmt::{Debug, Error, Formatter};
use std::rc::Rc; use std::rc::Rc;
use style_traits::DevicePixel; use style_traits::DevicePixel;
use style_traits::cursor::CursorKind; use style_traits::cursor::CursorKind;
use webrender_api::{DeviceIntPoint, DeviceSize, DevicePoint, DeviceUintSize, DeviceUintRect, ScrollLocation}; use webrender_api::{DeviceIntPoint, DevicePoint, DeviceUintSize, DeviceUintRect, ScrollLocation};
#[derive(Clone)] #[derive(Clone)]
pub enum MouseWindowEvent { pub enum MouseWindowEvent {
@ -122,8 +122,6 @@ pub trait WindowMethods {
fn framebuffer_size(&self) -> DeviceUintSize; fn framebuffer_size(&self) -> DeviceUintSize;
/// Returns the position and size of the window within the rendering area. /// Returns the position and size of the window within the rendering area.
fn window_rect(&self) -> DeviceUintRect; fn window_rect(&self) -> DeviceUintRect;
/// Returns the size of the window.
fn size(&self) -> DeviceSize;
/// Presents the window to the screen (perhaps by page flipping). /// Presents the window to the screen (perhaps by page flipping).
fn present(&self); fn present(&self);

6
ports/servo/glutin_app/window.rs
View file

@ -868,7 +868,7 @@ impl WindowMethods for Window {
} }
fn framebuffer_size(&self) -> DeviceUintSize { fn framebuffer_size(&self) -> DeviceUintSize {
self.size().to_u32() (self.inner_size.get().to_f32() * self.hidpi_factor()).to_u32()
} }
fn window_rect(&self) -> DeviceUintRect { fn window_rect(&self) -> DeviceUintRect {
@ -877,10 +877,6 @@ impl WindowMethods for Window {
DeviceUintRect::new(origin, size) DeviceUintRect::new(origin, size)
} }
fn size(&self) -> TypedSize2D<f32, DevicePixel> {
self.inner_size.get().to_f32() * self.hidpi_factor()
}
fn client_window(&self, _: BrowserId) -> (DeviceUintSize, DeviceIntPoint) { fn client_window(&self, _: BrowserId) -> (DeviceUintSize, DeviceIntPoint) {
let (size, point) = match self.kind { let (size, point) = match self.kind {
WindowKind::Window(ref window, ..) => { WindowKind::Window(ref window, ..) => {