review changes

components/compositing/compositor.rs

@@ -11,11 +11,11 @@ use scrolling::ScrollingTimerProxy;
 use windowing;
 use windowing::{MouseWindowEvent, WindowEvent, WindowMethods, WindowNavigateMsg};
 
-use euclid::Matrix4;
-use euclid::point::{Point2D, TypedPoint2D};
-use euclid::rect::{Rect, TypedRect};
+use euclid::{Size2D, Point2D, Rect, Matrix4};
+use euclid::point::TypedPoint2D;
+use euclid::rect::TypedRect;
 use euclid::scale_factor::ScaleFactor;
-use euclid::size::{Size2D, TypedSize2D};
+use euclid::size::TypedSize2D;
 use gfx_traits::color;
 use gfx::paint_task::{ChromeToPaintMsg, PaintRequest};
 use gleam::gl::types::{GLint, GLsizei};
@@ -388,7 +388,8 @@ impl<Window: WindowMethods> IOCompositor<Window> {
                 self.send_buffer_requests_for_all_layers();
             }
 
-            (Msg::GetNativeDisplay(chan), ShutdownState::NotShuttingDown) => {
+            (Msg::GetNativeDisplay(chan),
+             ShutdownState::NotShuttingDown) => {
                 chan.send(Some(self.native_display.clone())).unwrap();
             }
 
@@ -428,7 +429,8 @@ impl<Window: WindowMethods> IOCompositor<Window> {
                 self.window.set_inner_size(size);
             }
 
-            (Msg::GetClientWindow(send), ShutdownState::NotShuttingDown) => {
+            (Msg::GetClientWindow(send),
+             ShutdownState::NotShuttingDown) => {
                 let rect = self.window.client_window();
                 send.send(rect).unwrap();
             }

components/compositing/compositor_task.rs

@@ -11,9 +11,7 @@ use compositor;
 use headless;
 use windowing::{WindowEvent, WindowMethods};
 
-use euclid::point::Point2D;
-use euclid::size::Size2D;
-use euclid::rect::Rect;
+use euclid::{Size2D, Point2D, Rect};
 use ipc_channel::ipc::{IpcReceiver, IpcSender};
 use layers::platform::surface::{NativeDisplay, NativeSurface};
 use layers::layers::{BufferRequest, LayerBufferSet};
@@ -214,9 +212,12 @@ pub enum Msg {
     CollectMemoryReports(mem::ReportsChan),
     /// A status message to be displayed by the browser chrome.
     Status(Option<String>),
-    GetClientWindow(IpcSender<Rect<i32>>),
+    /// Get Window Informations size and position
+    GetClientWindow(IpcSender<(Size2D<u32>, Point2D<i32>)>),
+    /// Move the window to a point
     MoveTo(Point2D<i32>),
-    ResizeTo(Size2D<i32>),
+    /// Resize the window to size
+    ResizeTo(Size2D<u32>),
 }
 
 impl Debug for Msg {

components/compositing/headless.rs

@@ -5,8 +5,8 @@
 use compositor_task::{CompositorEventListener, CompositorReceiver, Msg};
 use windowing::WindowEvent;
 
+use euclid::{Size2D, Point2D};
 use euclid::scale_factor::ScaleFactor;
-use euclid::size::Size2D;
 use msg::constellation_msg::Msg as ConstellationMsg;
 use msg::constellation_msg::{ConstellationChan, WindowSizeData};
 use profile_traits::mem;
@@ -88,6 +88,10 @@ impl CompositorEventListener for NullCompositor {
                 response_chan.send(()).unwrap();
             }
 
+            Msg::GetClientWindow(send) => {
+               let rect = (Size2D::zero(), Point2D::zero());
+                send.send(rect).unwrap();
+            }
             // Explicitly list ignored messages so that when we add a new one,
             // we'll notice and think about whether it needs a response, like
             // SetFrameTree.
@@ -109,7 +113,6 @@ impl CompositorEventListener for NullCompositor {
             Msg::ViewportConstrained(..) => {}
             Msg::CreatePng(..) |
             Msg::PaintTaskExited(..) |
-            Msg::GetClientWindow(..) |
             Msg::MoveTo(..) |
             Msg::ResizeTo(..) |
             Msg::IsReadyToSaveImageReply(..) => {}

components/compositing/windowing.rs

@@ -6,10 +6,10 @@
 
 use compositor_task::{CompositorProxy, CompositorReceiver};
 
-use euclid::rect::Rect;
-use euclid::point::{TypedPoint2D, Point2D};
+use euclid::{Size2D, Point2D};
+use euclid::point::TypedPoint2D;
 use euclid::scale_factor::ScaleFactor;
-use euclid::size::{TypedSize2D, Size2D};
+use euclid::size::TypedSize2D;
 use layers::geometry::DevicePixel;
 use layers::platform::surface::NativeDisplay;
 use msg::constellation_msg::{Key, KeyState, KeyModifiers};
@@ -104,11 +104,11 @@ pub trait WindowMethods {
     /// Presents the window to the screen (perhaps by page flipping).
     fn present(&self);
 
-    /// Return outersize and position values
-    fn client_window(&self) -> Rect<i32>;
-
-    fn set_inner_size(&self, size: Size2D<i32>);
-
+    /// Return the size of the window with head and borders and position of the window values
+    fn client_window(&self) -> (Size2D<u32>, Point2D<i32>);
+    /// Set the size inside of borders and head
+    fn set_inner_size(&self, size: Size2D<u32>);
+    /// Set the window position
     fn set_position(&self, point: Point2D<i32>);
 
     /// Sets the page title for the current page.

components/msg/compositor_msg.rs

@@ -4,9 +4,7 @@
 
 use azure::azure_hl::Color;
 use constellation_msg::{Key, KeyState, KeyModifiers};
-use euclid::point::Point2D;
-use euclid::size::Size2D;
-use euclid::rect::Rect;
+use euclid::{Size2D, Point2D, Rect};
 use euclid::Matrix4;
 use ipc_channel::ipc::IpcSender;
 use layers::platform::surface::NativeDisplay;
@@ -122,9 +120,9 @@ pub enum ScriptToCompositorMsg {
     ScrollFragmentPoint(PipelineId, LayerId, Point2D<f32>),
     SetTitle(PipelineId, Option<String>),
     SendKeyEvent(Key, KeyState, KeyModifiers),
-    GetClientWindow(IpcSender<Rect<i32>>),
+    GetClientWindow(IpcSender<(Size2D<u32>, Point2D<i32>)>),
     MoveTo(Point2D<i32>),
-    ResizeTo(Size2D<i32>),
+    ResizeTo(Size2D<u32>),
     Exit,
 }
 
@@ -147,15 +145,15 @@ impl ScriptListener {
             .unwrap()
     }
 
-    pub fn client_window(&mut self, send: IpcSender<Rect<i32>>) {
+    pub fn client_window(&mut self, send: IpcSender<(Size2D<u32>, Point2D<i32>)>) {
         self.0.send(ScriptToCompositorMsg::GetClientWindow(send)).unwrap()
     }
 
     pub fn move_window(&mut self, point: Point2D<i32>) {
         self.0.send(ScriptToCompositorMsg::MoveTo(point)).unwrap()
     }
 
-    pub fn resize_window(&mut self, size: Size2D<i32>) {
+    pub fn resize_window(&mut self, size: Size2D<u32>) {
         self.0.send(ScriptToCompositorMsg::ResizeTo(size)).unwrap()
     }
 

components/script/dom/webidls/Window.webidl

@@ -132,11 +132,11 @@ partial interface Window {
   readonly attribute long scrollY;
   readonly attribute long pageYOffset;
   void scroll(optional ScrollToOptions options);
-  void scroll(unrestricted double x, unrestricted double y, optional ScrollOptions options);
+  void scroll(unrestricted double x, unrestricted double y);
   void scrollTo(optional ScrollToOptions options);
-  void scrollTo(unrestricted double x, unrestricted double y, optional ScrollOptions options);
+  void scrollTo(unrestricted double x, unrestricted double y);
   void scrollBy(optional ScrollToOptions options);
-  void scrollBy(unrestricted double x, unrestricted double y, optional ScrollOptions options);
+  void scrollBy(unrestricted double x, unrestricted double y);
 
   // client
   readonly attribute long screenX;