remove WindowMethods::size()

paulrouget · paulrouget · commit fef050626949 · 2018-03-16T14:58:17.000+08:00
diff --git a/components/compositing/windowing.rs b/components/compositing/windowing.rs
@@ -17,7 +17,7 @@ use std::fmt::{Debug, Error, Formatter};
 use std::rc::Rc;
 use style_traits::DevicePixel;
 use style_traits::cursor::CursorKind;
-use webrender_api::{DeviceIntPoint, DeviceSize, DevicePoint, DeviceUintSize, DeviceUintRect, ScrollLocation};
+use webrender_api::{DeviceIntPoint, DevicePoint, DeviceUintSize, DeviceUintRect, ScrollLocation};
 
 #[derive(Clone)]
 pub enum MouseWindowEvent {
@@ -122,8 +122,6 @@ pub trait WindowMethods {
     fn framebuffer_size(&self) -> DeviceUintSize;
     /// Returns the position and size of the window within the rendering area.
     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).
     fn present(&self);
 
diff --git a/ports/servo/glutin_app/window.rs b/ports/servo/glutin_app/window.rs
@@ -868,7 +868,7 @@ impl WindowMethods for Window {
     }
 
     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 {
@@ -877,10 +877,6 @@ impl WindowMethods for Window {
         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) {
         let (size, point) = match self.kind {
             WindowKind::Window(ref window, ..) => {

Original file line number	Diff line number	Diff line change
`@@ -868,7 +868,7 @@ impl WindowMethods for Window {`
`868`	`868`	`}`
`869`	`869`
`870`	`870`	`fn framebuffer_size(&self) -> DeviceUintSize {`
`871`		`- self.size().to_u32()`
	`871`	`+ (self.inner_size.get().to_f32() * self.hidpi_factor()).to_u32()`
`872`	`872`	`}`
`873`	`873`
`874`	`874`	`fn window_rect(&self) -> DeviceUintRect {`
`@@ -877,10 +877,6 @@ impl WindowMethods for Window {`
`877`	`877`	`DeviceUintRect::new(origin, size)`
`878`	`878`	`}`
`879`	`879`
`880`		`- fn size(&self) -> TypedSize2D<f32, DevicePixel> {`
`881`		`- self.inner_size.get().to_f32() * self.hidpi_factor()`
`882`		`- }`
`883`		`-`
`884`	`880`	`fn client_window(&self, _: BrowserId) -> (DeviceUintSize, DeviceIntPoint) {`
`885`	`881`	`let (size, point) = match self.kind {`
`886`	`882`	`WindowKind::Window(ref window, ..) => {`