aboutsummaryrefslogtreecommitdiffstats
path: root/components/compositing/compositor.rs
diff options
context:
space:
mode:
authorbors-servo <metajack+bors@gmail.com>2014-12-18 04:42:50 -0700
committerbors-servo <metajack+bors@gmail.com>2014-12-18 04:42:50 -0700
commiteea49ee1d986c306a8eec32b64be9b10cb2278fc (patch)
tree5c9555bd62fbb7375fab1561cb62660ea1022b7d /components/compositing/compositor.rs
parentd7b3900431598883212162460254c846bf5f8b52 (diff)
parentbf4480bb791cd918a00fb4bdea234fde676b28e0 (diff)
downloadservo-eea49ee1d986c306a8eec32b64be9b10cb2278fc.tar.gz
servo-eea49ee1d986c306a8eec32b64be9b10cb2278fc.zip
auto merge of #4420 : servo/servo/fix-warnings, r=Ms2ger
Diffstat (limited to 'components/compositing/compositor.rs')
-rw-r--r--components/compositing/compositor.rs7
1 files changed, 3 insertions, 4 deletions
diff --git a/components/compositing/compositor.rs b/components/compositing/compositor.rs
index 5b265d2ec15..59ceaea49dc 100644
--- a/components/compositing/compositor.rs
+++ b/components/compositing/compositor.rs
@@ -14,7 +14,6 @@ use windowing::{MouseWindowEvent, WindowEvent, WindowMethods, WindowNavigateMsg}
use azure::azure_hl;
use std::cmp;
use std::mem;
-use std::num::Zero;
use geom::point::{Point2D, TypedPoint2D};
use geom::rect::{Rect, TypedRect};
use geom::size::TypedSize2D;
@@ -176,7 +175,7 @@ impl<Window: WindowMethods> IOCompositor<Window> {
context: None,
root_pipeline: None,
scene: Scene::new(Rect {
- origin: Zero::zero(),
+ origin: Point2D::zero(),
size: window_size.as_f32(),
}),
window_size: window_size,
@@ -1027,7 +1026,7 @@ impl<Window: WindowMethods> IOCompositor<Window> {
debug!("compositor: compositing");
// Adjust the layer dimensions as necessary to correspond to the size of the window.
self.scene.viewport = Rect {
- origin: Zero::zero(),
+ origin: Point2D::zero(),
size: self.window_size.as_f32(),
};
// paint the scene.
@@ -1121,7 +1120,7 @@ impl<Window: WindowMethods> IOCompositor<Window> {
};
let clip_rect_for_children = if masks_to_bounds {
- Rect(Zero::zero(), clipped_layer_bounds.size)
+ Rect(Point2D::zero(), clipped_layer_bounds.size)
} else {
clipped_layer_bounds.translate(&clip_rect.origin)
};