Update euclid to 0.10.1

2025-08-05 21:50:18 +01:00 · 2016-08-19 17:13:23 +02:00 · 2016-08-19 17:13:23 +02:00 · 51768844ed
commit 51768844ed
parent 8a75810eba
37 changed files with 281 additions and 280 deletions
--- a/components/canvas/Cargo.toml
+++ b/components/canvas/Cargo.toml
@ -12,13 +12,13 @@ path = "lib.rs"
 [dependencies]
 azure = {git = "https://github.com/servo/rust-azure", features = ["plugins"]}
 canvas_traits = {path = "../canvas_traits"}
-euclid = "0.9"
+euclid = "0.10.1"
 gfx_traits = {path = "../gfx_traits"}
 gleam = "0.2.8"
 ipc-channel = "0.5"
 log = "0.3.5"
 num-traits = "0.1.32"
-offscreen_gl_context = "0.3"
+offscreen_gl_context = "0.4"
 plugins = {path = "../plugins"}
 util = {path = "../util"}

--- a/components/canvas/canvas_paint_thread.rs
+++ b/components/canvas/canvas_paint_thread.rs
@ -683,9 +683,10 @@ impl<'a> CanvasPaintThread<'a> {
        let draw_target = self.drawtarget.create_similar_draw_target(&Size2D::new(source_rect.size.width as i32,
                                                                                  source_rect.size.height as i32),
                                                                     self.drawtarget.get_format());
-        let matrix = Matrix2D::identity().translate(-source_rect.origin.x as AzFloat,
+        let matrix = Matrix2D::identity()
+            .pre_translated(-source_rect.origin.x as AzFloat,
                            -source_rect.origin.y as AzFloat)
-                                         .mul(&self.state.transform);
+            .pre_mul(&self.state.transform);
        draw_target.set_transform(&matrix);
        draw_target
    }
--- a/components/canvas_traits/Cargo.toml
+++ b/components/canvas_traits/Cargo.toml
@ -12,7 +12,7 @@ path = "lib.rs"
 [dependencies]
 azure = {git = "https://github.com/servo/rust-azure", features = ["plugins"]}
 cssparser = {version = "0.5.7", features = ["heap_size", "serde-serialization"]}
-euclid = "0.9"
+euclid = "0.10.1"
 gfx_traits = {path = "../gfx_traits"}
 heapsize = "0.3.0"
 heapsize_plugin = "0.1.2"
--- a/components/compositing/Cargo.toml
+++ b/components/compositing/Cargo.toml
@ -12,7 +12,7 @@ path = "lib.rs"
 [dependencies]
 app_units = "0.3"
 azure = {git = "https://github.com/servo/rust-azure", features = ["plugins"]}
-euclid = "0.9"
+euclid = "0.10.1"
 gfx_traits = {path = "../gfx_traits"}
 gleam = "0.2.8"
 image = "0.10"
--- a/components/compositing/compositor.rs
+++ b/components/compositing/compositor.rs
@ -467,7 +467,7 @@ impl<Window: WindowMethods> IOCompositor<Window> {
            context: None,
            root_pipeline: None,
            pipeline_details: HashMap::new(),
-            scene: Scene::new(TypedRect::new(TypedPoint2D::zero(), window_size.as_f32())),
+            scene: Scene::new(TypedRect::new(TypedPoint2D::zero(), window_size.to_f32())),
            window_size: window_size,
            viewport: None,
            scale_factor: scale_factor,
@ -898,7 +898,7 @@ impl<Window: WindowMethods> IOCompositor<Window> {

        self.scene.root = Some(self.create_root_layer_for_pipeline_and_size(&frame_tree.pipeline,
                                                                            None));
-        self.scene.set_root_layer_size(self.window_size.as_f32());
+        self.scene.set_root_layer_size(self.window_size.to_f32());

        self.create_pipeline_details_for_frame_tree(&frame_tree);

@ -1146,7 +1146,7 @@ impl<Window: WindowMethods> IOCompositor<Window> {

    fn send_window_size(&self, size_type: WindowSizeType) {
        let dppx = self.page_zoom * self.device_pixels_per_screen_px();
-        let initial_viewport = self.window_size.as_f32() / dppx;
+        let initial_viewport = self.window_size.to_f32() / dppx;
        let visible_viewport = initial_viewport / self.viewport_zoom;
        let msg = ConstellationMsg::WindowSize(WindowSizeData {
            device_pixel_ratio: dppx,
@ -1383,7 +1383,7 @@ impl<Window: WindowMethods> IOCompositor<Window> {

        self.window_size = new_size;

-        self.scene.set_root_layer_size(new_size.as_f32());
+        self.scene.set_root_layer_size(new_size.to_f32());
        self.send_window_size(WindowSizeType::Resize);
    }

@ -1627,8 +1627,8 @@ impl<Window: WindowMethods> IOCompositor<Window> {
                    if let Some(combined_event) = last_combined_event {
                        if combined_event.phase != scroll_event.phase {
                            let delta = (combined_event.delta / self.scene.scale).to_untyped();
-                            let cursor = (combined_event.cursor.as_f32() /
-                                          self.scene.scale).to_untyped();
+                            let cursor =
+                                (combined_event.cursor.to_f32() / self.scene.scale).to_untyped();
                            webrender_api.scroll(delta, cursor, combined_event.phase);
                            last_combined_event = None
                        }
@ -1669,7 +1669,7 @@ impl<Window: WindowMethods> IOCompositor<Window> {
                // TODO(gw): Support zoom (WR issue #28).
                if let Some(combined_event) = last_combined_event {
                    let delta = (combined_event.delta / self.scene.scale).to_untyped();
-                    let cursor = (combined_event.cursor.as_f32() / self.scene.scale).to_untyped();
+                    let cursor = (combined_event.cursor.to_f32() / self.scene.scale).to_untyped();
                    webrender_api.scroll(delta, cursor, combined_event.phase);
                    self.waiting_for_results_of_scroll = true
                }
@ -1678,7 +1678,7 @@ impl<Window: WindowMethods> IOCompositor<Window> {
                for event in std_mem::replace(&mut self.pending_scroll_zoom_events,
                                                     Vec::new()) {
                    let delta = event.delta / self.scene.scale;
-                    let cursor = event.cursor.as_f32() / self.scene.scale;
+                    let cursor = event.cursor.to_f32() / self.scene.scale;

                    if let Some(ref mut layer) = self.scene.root {
                        layer.handle_scroll_event(delta, cursor);
@ -1736,7 +1736,7 @@ impl<Window: WindowMethods> IOCompositor<Window> {
        }

        let dppx = self.page_zoom * self.device_pixels_per_screen_px();
-        let window_size = self.window_size.as_f32() / dppx * ScaleFactor::new(1.0);
+        let window_size = self.window_size.to_f32() / dppx * ScaleFactor::new(1.0);
        let mut new_visible_rects = HashMap::new();
        if let Some(ref layer) = self.scene.root {
            process_layer(&**layer, &window_size, &mut new_visible_rects)
@ -1835,7 +1835,7 @@ impl<Window: WindowMethods> IOCompositor<Window> {

        // We need to set the size of the root layer again, since the window size
        // has changed in unscaled layer pixels.
-        self.scene.set_root_layer_size(self.window_size.as_f32());
+        self.scene.set_root_layer_size(self.window_size.to_f32());
    }

    fn on_zoom_reset_window_event(&mut self) {
@ -2236,8 +2236,8 @@ impl<Window: WindowMethods> IOCompositor<Window> {
            self.dump_layer_tree();
            // Adjust the layer dimensions as necessary to correspond to the size of the window.
            self.scene.viewport = match self.viewport {
-                Some((point, size)) => TypedRect::new(point.as_f32(), size.as_f32()),
-                None => TypedRect::new(TypedPoint2D::zero(), self.window_size.as_f32()),
+                Some((point, size)) => TypedRect::new(point.to_f32(), size.to_f32()),
+                None => TypedRect::new(TypedPoint2D::zero(), self.window_size.to_f32()),
            };

            // Paint the scene.
--- a/components/constellation/Cargo.toml
+++ b/components/constellation/Cargo.toml
@ -15,7 +15,7 @@ canvas = {path = "../canvas"}
 canvas_traits = {path = "../canvas_traits"}
 compositing = {path = "../compositing"}
 devtools_traits = {path = "../devtools_traits"}
-euclid = "0.9"
+euclid = "0.10.1"
 gfx = {path = "../gfx"}
 gfx_traits = {path = "../gfx_traits"}
 ipc-channel = "0.5"
@ -24,7 +24,7 @@ layout_traits = {path = "../layout_traits"}
 log = "0.3.5"
 msg = {path = "../msg"}
 net_traits = {path = "../net_traits"}
-offscreen_gl_context = "0.3"
+offscreen_gl_context = "0.4"
 plugins = {path = "../plugins"}
 profile_traits = {path = "../profile_traits"}
 rand = "0.3"
--- a/components/constellation/constellation.rs
+++ b/components/constellation/constellation.rs
@ -501,9 +501,9 @@ impl<Message, LTF, STF> Constellation<Message, LTF, STF>
                time_profiler_chan: state.time_profiler_chan,
                mem_profiler_chan: state.mem_profiler_chan,
                window_size: WindowSizeData {
-                    visible_viewport: opts::get().initial_window_size.as_f32() *
+                    visible_viewport: opts::get().initial_window_size.to_f32() *
                                          ScaleFactor::new(1.0),
-                    initial_viewport: opts::get().initial_window_size.as_f32() *
+                    initial_viewport: opts::get().initial_window_size.to_f32() *
                        ScaleFactor::new(1.0),
                    device_pixel_ratio:
                        ScaleFactor::new(opts::get().device_pixels_per_px.unwrap_or(1.0)),
--- a/components/gfx/Cargo.toml
+++ b/components/gfx/Cargo.toml
@ -14,7 +14,7 @@ path = "lib.rs"
 app_units = "0.3"
 azure = {git = "https://github.com/servo/rust-azure", features = ["plugins"]}
 bitflags = "0.7"
-euclid = "0.9"
+euclid = "0.10.1"
 fnv = "1.0"
 gfx_traits = {path = "../gfx_traits"}
 harfbuzz-sys = "0.1"
--- a/components/gfx/display_list/mod.rs
+++ b/components/gfx/display_list/mod.rs
@ -21,7 +21,7 @@ use euclid::approxeq::ApproxEq;
 use euclid::num::{One, Zero};
 use euclid::rect::TypedRect;
 use euclid::side_offsets::SideOffsets2D;
-use euclid::{Matrix2D, Matrix4D, Point2D, Rect, Size2D};
+use euclid::{Matrix4D, Point2D, Rect, Size2D};
 use fnv::FnvHasher;
 use gfx_traits::print_tree::PrintTree;
 use gfx_traits::{LayerId, ScrollPolicy, StackingContextId};
@ -339,10 +339,7 @@ impl DisplayList {
                                           transform: &Matrix4D<f32>,
                                           index: usize) {
        let old_transform = paint_context.draw_target.get_transform();
-        paint_context.draw_target.set_transform(
-            &Matrix2D::new(transform.m11, transform.m12,
-                           transform.m21, transform.m22,
-                           transform.m41, transform.m42));
+        paint_context.draw_target.set_transform(&transform.to_2d());

        let item = &self.list[index];
        item.draw_into_context(paint_context);
@ -459,9 +456,11 @@ impl DisplayList {
                    Point2D::new(origin.x.to_nearest_pixel(pixels_per_px.get()),
                                 origin.y.to_nearest_pixel(pixels_per_px.get()));

-                let transform = transform.translate(pixel_snapped_origin.x as AzFloat,
+                let transform = transform
+                    .pre_translated(pixel_snapped_origin.x as AzFloat,
                                    pixel_snapped_origin.y as AzFloat,
-                                                    0.0).mul(&stacking_context.transform);
+                                    0.0)
+                    .pre_mul(&stacking_context.transform);

                if transform.is_identity_or_simple_translation() {
                    let pixel_snapped_origin = Point2D::new(Au::from_f32_px(pixel_snapped_origin.x),
@ -477,6 +476,18 @@ impl DisplayList {
            }
        };

+        let transformed_transform =
+            match transformed_tile_rect(paint_context.screen_rect, &transform) {
+                Some(transformed) => transformed,
+                None => {
+                    // https://drafts.csswg.org/css-transforms/#transform-function-lists
+                    // If a transform function causes the current transformation matrix (CTM)
+                    // of an object to be non-invertible, the object and its content do not
+                    // get displayed.
+                    return;
+                },
+            };
+
        {
            let mut paint_subcontext = PaintContext {
                draw_target: draw_target.clone(),
@ -490,10 +501,7 @@ impl DisplayList {
            };

            // Set up our clip rect and transform.
-            paint_subcontext.draw_target.set_transform(
-                &Matrix2D::new(transform.m11, transform.m12,
-                               transform.m21, transform.m22,
-                               transform.m41, transform.m42));
+            paint_subcontext.draw_target.set_transform(&transform.to_2d());
            paint_subcontext.push_clip_if_applicable();

            self.draw_stacking_context_contents(
@ -502,7 +510,7 @@ impl DisplayList {
                &mut paint_subcontext,
                &transform,
                &subpixel_offset,
-                Some(transformed_tile_rect(paint_context.screen_rect, &transform)));
+                Some(transformed_transform));

            paint_subcontext.remove_transient_clip_if_applicable();
            paint_subcontext.pop_clip_if_applicable();
@ -535,17 +543,20 @@ impl DisplayList {
    }
 }

-fn transformed_tile_rect(tile_rect: TypedRect<usize, ScreenPx>, transform: &Matrix4D<f32>) -> Rect<Au> {
+fn transformed_tile_rect(tile_rect: TypedRect<usize, ScreenPx>,
+                         transform: &Matrix4D<f32>)
+                         -> Option<Rect<Au>> {
    // Invert the current transform, then use this to back transform
    // the tile rect (placed at the origin) into the space of this
    // stacking context.
-    let inverse_transform = transform.invert();
-    let inverse_transform_2d = Matrix2D::new(inverse_transform.m11, inverse_transform.m12,
-                                             inverse_transform.m21, inverse_transform.m22,
-                                             inverse_transform.m41, inverse_transform.m42);
-    let tile_size = Size2D::new(tile_rect.as_f32().size.width, tile_rect.as_f32().size.height);
+    let inverse_transform = match transform.inverse() {
+        Some(inverse) => inverse,
+        None => return None,
+    };
+    let inverse_transform_2d = inverse_transform.to_2d();
+    let tile_size = Size2D::new(tile_rect.to_f32().size.width, tile_rect.to_f32().size.height);
    let tile_rect = Rect::new(Point2D::zero(), tile_size).to_untyped();
-    geometry::f32_rect_to_au_rect(inverse_transform_2d.transform_rect(&tile_rect))
+    Some(geometry::f32_rect_to_au_rect(inverse_transform_2d.transform_rect(&tile_rect)))
 }


@ -699,11 +710,9 @@ impl StackingContext {
        let origin_x = self.bounds.origin.x.to_f32_px();
        let origin_y = self.bounds.origin.y.to_f32_px();

-        let transform = Matrix4D::identity().translate(origin_x, origin_y, 0.0)
-                                            .mul(&self.transform);
-        let transform_2d = Matrix2D::new(transform.m11, transform.m12,
-                                         transform.m21, transform.m22,
-                                         transform.m41, transform.m42);
+        let transform = Matrix4D::identity().pre_translated(origin_x, origin_y, 0.0)
+                                            .pre_mul(&self.transform);
+        let transform_2d = transform.to_2d();

        let overflow = geometry::au_rect_to_f32_rect(self.overflow);
        let overflow = transform_2d.transform_rect(&overflow);
@ -726,7 +735,7 @@ impl StackingContext {
        // Convert the point into stacking context local transform space.
        let mut point = if self.context_type == StackingContextType::Real {
            let point = *effective_point - self.bounds.origin;
-            let inv_transform = self.transform.invert();
+            let inv_transform = self.transform.inverse().unwrap();
            let frac_point = inv_transform.transform_point(&Point2D::new(point.x.to_f32_px(),
                                                                         point.y.to_f32_px()));
            Point2D::new(Au::from_f32_px(frac_point.x), Au::from_f32_px(frac_point.y))
--- a/components/gfx/paint_context.rs
+++ b/components/gfx/paint_context.rs
@ -127,7 +127,7 @@ impl<'a> PaintContext<'a> {
    }

    pub fn screen_pixels_per_px(&self) -> ScaleFactor<f32, PagePx, ScreenPx> {
-        ScaleFactor::new(self.screen_rect.as_f32().size.width / self.page_rect.size.width)
+        ScaleFactor::new(self.screen_rect.to_f32().size.width / self.page_rect.size.width)
    }

    pub fn draw_target(&self) -> &DrawTarget {
@ -242,7 +242,7 @@ impl<'a> PaintContext<'a> {
        //
        // Annoyingly, surface patterns in Azure/Skia are relative to the top left of the *canvas*,
        // not the rectangle we're drawing to. So we need to translate it explicitly.
-        let matrix = Matrix2D::identity().translate(dest_rect.origin.x, dest_rect.origin.y);
+        let matrix = Matrix2D::identity().pre_translated(dest_rect.origin.x, dest_rect.origin.y);
        let stretch_size = stretch_size.to_nearest_azure_size(scale);
        if source_rect.size == stretch_size {
            let pattern = SurfacePattern::new(azure_surface.azure_source_surface,
@ -1358,17 +1358,15 @@ impl<'a> PaintContext<'a> {
            SidewaysLeft => {
                let x = origin.x.to_f32_px();
                let y = origin.y.to_f32_px();
-                self.draw_target.set_transform(&draw_target_transform.mul(&Matrix2D::new(0., -1.,
-                                                                                         1., 0.,
-                                                                                         x, y)));
+                self.draw_target.set_transform(
+                    &draw_target_transform.pre_mul(&Matrix2D::row_major(0., -1., 1., 0., x, y)));
                Point2D::zero()
            }
            SidewaysRight => {
                let x = origin.x.to_f32_px();
                let y = origin.y.to_f32_px();
-                self.draw_target.set_transform(&draw_target_transform.mul(&Matrix2D::new(0., 1.,
-                                                                                         -1., 0.,
-                                                                                         x, y)));
+                self.draw_target.set_transform(
+                    &draw_target_transform.pre_mul(&Matrix2D::row_major(0., 1., -1., 0., x, y)));
                Point2D::zero()
            }
        };
@ -1450,9 +1448,10 @@ impl<'a> PaintContext<'a> {
                                          Size2D::new(size.width as AzFloat,
                                                      size.height as AzFloat));
            let temporary_draw_target_bounds = old_transform.transform_rect(&inflated_size);
-            matrix = Matrix2D::identity().translate(
-                -temporary_draw_target_bounds.origin.x as AzFloat,
-                -temporary_draw_target_bounds.origin.y as AzFloat).mul(&old_transform);
+            matrix = Matrix2D::identity()
+                .pre_translated(-temporary_draw_target_bounds.origin.x as AzFloat,
+                                -temporary_draw_target_bounds.origin.y as AzFloat)
+                .pre_mul(&old_transform);
        }

        let temporary_draw_target =
@ -1978,10 +1977,10 @@ impl TemporaryDrawTarget {
        let temporary_draw_target =
            main_draw_target.create_similar_draw_target(&temporary_draw_target_size,
                                                        main_draw_target.get_format());
-        let matrix =
-            Matrix2D::identity().translate(-temporary_draw_target_bounds.origin.x as AzFloat,
+        let matrix = Matrix2D::identity()
+            .pre_translated(-temporary_draw_target_bounds.origin.x as AzFloat,
                            -temporary_draw_target_bounds.origin.y as AzFloat)
-                                .mul(&draw_target_transform);
+            .pre_mul(&draw_target_transform);
        temporary_draw_target.set_transform(&matrix);
        TemporaryDrawTarget {
            draw_target: temporary_draw_target,
--- a/components/gfx/paint_thread.rs
+++ b/components/gfx/paint_thread.rs
@ -77,8 +77,8 @@ impl PaintLayer {
            Size2D::new(bounds.size.width.to_nearest_px() as f32,
                        bounds.size.height.to_nearest_px() as f32));

-        let transform = transform.mul(&stacking_context.transform);
-        let perspective = perspective.mul(&stacking_context.perspective);
+        let transform = transform.pre_mul(&stacking_context.transform);
+        let perspective = perspective.pre_mul(&stacking_context.perspective);
        let establishes_3d_context = stacking_context.establishes_3d_context;
        let scrolls_overflow_area = stacking_context.scrolls_overflow_area;

@ -244,8 +244,8 @@ impl LayerCreator {
        self.process_stacking_context_items(stacking_context,
                                            traversal,
                                            &(stacking_context.bounds.origin + *parent_origin),
-                                            &transform.mul(&stacking_context.transform),
-                                            &perspective.mul(&stacking_context.perspective));
+                                            &transform.pre_mul(&stacking_context.transform),
+                                            &perspective.pre_mul(&stacking_context.perspective));
    }

    fn process_stacking_context_items<'a>(&mut self,
@ -694,9 +694,9 @@ impl WorkerThread {

            // Apply the translation to paint the tile we want.
            let matrix = Matrix4D::identity();
-            let matrix = matrix.scale(scale as AzFloat, scale as AzFloat, 1.0);
+            let matrix = matrix.pre_scaled(scale as AzFloat, scale as AzFloat, 1.0);
            let tile_bounds = tile.page_rect.translate(&paint_layer.display_list_origin);
-            let matrix = matrix.translate(-tile_bounds.origin.x as AzFloat,
+            let matrix = matrix.pre_translated(-tile_bounds.origin.x as AzFloat,
                                                -tile_bounds.origin.y as AzFloat,
                                                0.0);

--- a/components/gfx_traits/Cargo.toml
+++ b/components/gfx_traits/Cargo.toml
@ -11,7 +11,7 @@ path = "lib.rs"

 [dependencies]
 azure = {git = "https://github.com/servo/rust-azure", features = ["plugins"]}
-euclid = "0.9"
+euclid = "0.10.1"
 heapsize = "0.3.0"
 heapsize_plugin = "0.1.2"
 layers = {git = "https://github.com/servo/rust-layers", features = ["plugins"]}
--- a/components/layout/Cargo.toml
+++ b/components/layout/Cargo.toml
@ -15,7 +15,7 @@ azure = {git = "https://github.com/servo/rust-azure", features = ["plugins"]}
 bitflags = "0.7"
 canvas_traits = {path = "../canvas_traits"}
 cssparser = {version = "0.5.7", features = ["heap_size", "serde-serialization"]}
-euclid = "0.9"
+euclid = "0.10.1"
 fnv = "1.0"
 gfx = {path = "../gfx"}
 gfx_traits = {path = "../gfx_traits"}
--- a/components/layout/display_list_builder.rs
+++ b/components/layout/display_list_builder.rs
@ -15,7 +15,7 @@ use azure::azure_hl::Color;
 use block::{BlockFlow, BlockStackingContextType};
 use canvas_traits::{CanvasMsg, CanvasData, FromLayoutMsg};
 use context::LayoutContext;
-use euclid::{Matrix4D, Point2D, Point3D, Rect, SideOffsets2D, Size2D};
+use euclid::{Matrix4D, Point2D, Point3D, Radians, Rect, SideOffsets2D, Size2D};
 use flex::FlexFlow;
 use flow::{BaseFlow, Flow, IS_ABSOLUTELY_POSITIONED};
 use flow_ref;
@ -1367,7 +1367,7 @@ impl FragmentDisplayListBuilding for Fragment {
                let matrix = match *operation {
                    transform::ComputedOperation::Rotate(ax, ay, az, theta) => {
                        let theta = 2.0f32 * f32::consts::PI - theta.radians();
-                        Matrix4D::create_rotation(ax, ay, az, theta)
+                        Matrix4D::create_rotation(ax, ay, az, Radians::new(theta))
                    }
                    transform::ComputedOperation::Perspective(d) => {
                        create_perspective_matrix(d)
@ -1385,14 +1385,15 @@ impl FragmentDisplayListBuilding for Fragment {
                        m.to_gfx_matrix()
                    }
                    transform::ComputedOperation::Skew(theta_x, theta_y) => {
-                        Matrix4D::create_skew(theta_x.radians(), theta_y.radians())
+                        Matrix4D::create_skew(Radians::new(theta_x.radians()),
+                                              Radians::new(theta_y.radians()))
                    }
                };

-                transform = transform.mul(&matrix);
+                transform = transform.pre_mul(&matrix);
            }

-            transform = pre_transform.mul(&transform).mul(&post_transform);
+            transform = pre_transform.pre_mul(&transform).pre_mul(&post_transform);
        }

        let perspective = match self.style().get_effects().perspective {
@ -1413,7 +1414,7 @@ impl FragmentDisplayListBuilding for Fragment {

                let perspective_matrix = create_perspective_matrix(d);

-                pre_transform.mul(&perspective_matrix).mul(&post_transform)
+                pre_transform.pre_mul(&perspective_matrix).pre_mul(&post_transform)
            }
            LengthOrNone::None => {
                Matrix4D::identity()
--- a/components/layout/model.rs
+++ b/components/layout/model.rs
@ -493,7 +493,7 @@ pub trait ToGfxMatrix {

 impl ToGfxMatrix for ComputedMatrix {
    fn to_gfx_matrix(&self) -> Matrix4D<f32> {
-        Matrix4D::new(
+        Matrix4D::row_major(
            self.m11 as f32, self.m12 as f32, self.m13 as f32, self.m14 as f32,
            self.m21 as f32, self.m22 as f32, self.m23 as f32, self.m24 as f32,
            self.m31 as f32, self.m32 as f32, self.m33 as f32, self.m34 as f32,
--- a/components/layout_thread/Cargo.toml
+++ b/components/layout_thread/Cargo.toml
@ -12,7 +12,7 @@ path = "lib.rs"
 [dependencies]
 app_units = "0.3"
 azure = {git = "https://github.com/servo/rust-azure", features = ["plugins"]}
-euclid = "0.9"
+euclid = "0.10.1"
 fnv = "1.0"
 gfx = {path = "../gfx"}
 gfx_traits = {path = "../gfx_traits"}
--- a/components/layout_thread/lib.rs
+++ b/components/layout_thread/lib.rs
@ -392,7 +392,7 @@ impl LayoutThread {
           -> LayoutThread {
        let device = Device::new(
            MediaType::Screen,
-            opts::get().initial_window_size.as_f32() * ScaleFactor::new(1.0));
+            opts::get().initial_window_size.to_f32() * ScaleFactor::new(1.0));
        let parallel_traversal = if layout_threads != 1 {
            Some(WorkQueue::new("LayoutWorker", thread_state::LAYOUT, layout_threads))
        } else {
--- a/components/script/Cargo.toml
+++ b/components/script/Cargo.toml
@ -30,7 +30,7 @@ cookie = {version = "0.2.5", features = ["serialize-rustc"]}
 cssparser = {version = "0.5.7", features = ["heap_size", "serde-serialization"]}
 devtools_traits = {path = "../devtools_traits"}
 encoding = "0.2"
-euclid = "0.9"
+euclid = "0.10.1"
 fnv = "1.0"
 gfx_traits = {path = "../gfx_traits"}
 heapsize = "0.3.6"
@ -48,7 +48,7 @@ mime_guess = "1.8.0"
 msg = {path = "../msg"}
 net_traits = {path = "../net_traits"}
 num-traits = "0.1.32"
-offscreen_gl_context = "0.3"
+offscreen_gl_context = "0.4"
 open = "1.1.1"
 phf = "0.7.16"
 phf_macros = "0.7.16"
--- a/components/script/dom/canvasrenderingcontext2d.rs
+++ b/components/script/dom/canvasrenderingcontext2d.rs
@ -573,7 +573,7 @@ impl CanvasRenderingContext2DMethods for CanvasRenderingContext2D {
        }

        let transform = self.state.borrow().transform;
-        self.state.borrow_mut().transform = transform.scale(x as f32, y as f32);
+        self.state.borrow_mut().transform = transform.pre_scaled(x as f32, y as f32);
        self.update_transform()
    }

@ -585,7 +585,8 @@ impl CanvasRenderingContext2DMethods for CanvasRenderingContext2D {

        let (sin, cos) = (angle.sin(), angle.cos());
        let transform = self.state.borrow().transform;
-        self.state.borrow_mut().transform = transform.mul(&Matrix2D::new(cos as f32, sin as f32,
+        self.state.borrow_mut().transform = transform.pre_mul(
+            &Matrix2D::row_major(cos as f32, sin as f32,
                                 -sin as f32, cos as f32,
                                 0.0, 0.0));
        self.update_transform()
@ -598,7 +599,7 @@ impl CanvasRenderingContext2DMethods for CanvasRenderingContext2D {
        }

        let transform = self.state.borrow().transform;
-        self.state.borrow_mut().transform = transform.translate(x as f32, y as f32);
+        self.state.borrow_mut().transform = transform.pre_translated(x as f32, y as f32);
        self.update_transform()
    }

@ -610,12 +611,8 @@ impl CanvasRenderingContext2DMethods for CanvasRenderingContext2D {
        }

        let transform = self.state.borrow().transform;
-        self.state.borrow_mut().transform = transform.mul(&Matrix2D::new(a as f32,
-                                                                         b as f32,
-                                                                         c as f32,
-                                                                         d as f32,
-                                                                         e as f32,
-                                                                         f as f32));
+        self.state.borrow_mut().transform = transform.pre_mul(
+            &Matrix2D::row_major(a as f32, b as f32, c as f32, d as f32, e as f32, f as f32));
        self.update_transform()
    }

@ -626,12 +623,8 @@ impl CanvasRenderingContext2DMethods for CanvasRenderingContext2D {
            return;
        }

-        self.state.borrow_mut().transform = Matrix2D::new(a as f32,
-                                                          b as f32,
-                                                          c as f32,
-                                                          d as f32,
-                                                          e as f32,
-                                                          f as f32);
+        self.state.borrow_mut().transform =
+            Matrix2D::row_major(a as f32, b as f32, c as f32, d as f32, e as f32, f as f32);
        self.update_transform()
    }

--- a/components/script_layout_interface/Cargo.toml
+++ b/components/script_layout_interface/Cargo.toml
@ -14,7 +14,7 @@ app_units = "0.3"
 bitflags = "0.7"
 canvas_traits = {path = "../canvas_traits"}
 cssparser = {version = "0.5.7", features = ["heap_size", "serde-serialization"]}
-euclid = "0.9"
+euclid = "0.10.1"
 gfx_traits = {path = "../gfx_traits"}
 heapsize = "0.3.0"
 heapsize_plugin = "0.1.2"
--- a/components/script_traits/Cargo.toml
+++ b/components/script_traits/Cargo.toml
@ -14,7 +14,7 @@ app_units = "0.3"
 canvas_traits = {path = "../canvas_traits"}
 cookie = {version = "0.2.5", features = ["serialize-rustc"]}
 devtools_traits = {path = "../devtools_traits"}
-euclid = "0.9"
+euclid = "0.10.1"
 gfx_traits = {path = "../gfx_traits"}
 heapsize = "0.3.0"
 heapsize_plugin = "0.1.2"
@ -24,7 +24,7 @@ layers = {git = "https://github.com/servo/rust-layers", features = ["plugins"]}
 libc = "0.2"
 msg = {path = "../msg"}
 net_traits = {path = "../net_traits"}
-offscreen_gl_context = "0.3"
+offscreen_gl_context = "0.4"
 plugins = {path = "../plugins"}
 profile_traits = {path = "../profile_traits"}
 rustc-serialize = "0.3.4"
--- a/components/servo/Cargo.lock
+++ b/components/servo/Cargo.lock
@ -13,7 +13,7 @@ dependencies = [
 "devtools 0.0.1",
 "devtools_traits 0.0.1",
 "env_logger 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "gaol 0.0.1 (git+https://github.com/servo/gaol)",
 "gfx 0.0.1",
 "gfx_tests 0.0.1",
@ -45,8 +45,8 @@ dependencies = [
 "util 0.0.1",
 "util_tests 0.0.1",
 "webdriver_server 0.0.1",
- "webrender 0.4.0 (git+https://github.com/servo/webrender)",
- "webrender_traits 0.4.0 (git+https://github.com/servo/webrender)",
+ "webrender 0.5.1 (git+https://github.com/servo/webrender)",
+ "webrender_traits 0.5.1 (git+https://github.com/servo/webrender)",
 ]

 [[package]]
@ -103,14 +103,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
 name = "azure"
-version = "0.7.1"
-source = "git+https://github.com/servo/rust-azure#d5ca43ba0e1e0fc33832060728d7ed60520541f8"
+version = "0.8.0"
+source = "git+https://github.com/servo/rust-azure#9fb666b2fc86b23761f9b0f877a3d42f182263a9"
 dependencies = [
 "cmake 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
 "core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "core-graphics 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "core-text 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "freetype 0.1.0 (git+https://github.com/servo/rust-freetype)",
 "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "heapsize_plugin 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
@ -119,7 +119,7 @@ dependencies = [
 "serde_macros 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "servo-egl 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "servo-freetype-sys 4.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "servo-skia 0.20130412.22 (registry+https://github.com/rust-lang/crates.io-index)",
+ "servo-skia 0.20130412.23 (registry+https://github.com/rust-lang/crates.io-index)",
 "x11 2.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@ -211,27 +211,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 name = "canvas"
 version = "0.0.1"
 dependencies = [
- "azure 0.7.1 (git+https://github.com/servo/rust-azure)",
+ "azure 0.8.0 (git+https://github.com/servo/rust-azure)",
 "canvas_traits 0.0.1",
- "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "gfx_traits 0.0.1",
 "gleam 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)",
 "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "num-traits 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
- "offscreen_gl_context 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "offscreen_gl_context 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "plugins 0.0.1",
 "util 0.0.1",
- "webrender_traits 0.4.0 (git+https://github.com/servo/webrender)",
+ "webrender_traits 0.5.1 (git+https://github.com/servo/webrender)",
 ]

 [[package]]
 name = "canvas_traits"
 version = "0.0.1"
 dependencies = [
- "azure 0.7.1 (git+https://github.com/servo/rust-azure)",
+ "azure 0.8.0 (git+https://github.com/servo/rust-azure)",
 "cssparser 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "gfx_traits 0.0.1",
 "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "heapsize_plugin 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
@ -239,7 +239,7 @@ dependencies = [
 "plugins 0.0.1",
 "serde 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_macros 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "webrender_traits 0.4.0 (git+https://github.com/servo/webrender)",
+ "webrender_traits 0.5.1 (git+https://github.com/servo/webrender)",
 ]

 [[package]]
@ -311,13 +311,13 @@ name = "compositing"
 version = "0.0.1"
 dependencies = [
 "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "azure 0.7.1 (git+https://github.com/servo/rust-azure)",
- "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "azure 0.8.0 (git+https://github.com/servo/rust-azure)",
+ "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "gfx_traits 0.0.1",
 "gleam 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)",
 "image 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "layers 0.4.0 (git+https://github.com/servo/rust-layers)",
+ "layers 0.5.1 (git+https://github.com/servo/rust-layers)",
 "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "msg 0.0.1",
 "net_traits 0.0.1",
@ -330,8 +330,8 @@ dependencies = [
 "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)",
 "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "util 0.0.1",
- "webrender 0.4.0 (git+https://github.com/servo/webrender)",
- "webrender_traits 0.4.0 (git+https://github.com/servo/webrender)",
+ "webrender 0.5.1 (git+https://github.com/servo/webrender)",
+ "webrender_traits 0.5.1 (git+https://github.com/servo/webrender)",
 ]

 [[package]]
@ -343,17 +343,17 @@ dependencies = [
 "canvas_traits 0.0.1",
 "compositing 0.0.1",
 "devtools_traits 0.0.1",
- "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "gaol 0.0.1 (git+https://github.com/servo/gaol)",
 "gfx 0.0.1",
 "gfx_traits 0.0.1",
 "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "layers 0.4.0 (git+https://github.com/servo/rust-layers)",
+ "layers 0.5.1 (git+https://github.com/servo/rust-layers)",
 "layout_traits 0.0.1",
 "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "msg 0.0.1",
 "net_traits 0.0.1",
- "offscreen_gl_context 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "offscreen_gl_context 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "plugins 0.0.1",
 "profile_traits 0.0.1",
 "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
@ -363,7 +363,7 @@ dependencies = [
 "style_traits 0.0.1",
 "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "util 0.0.1",
- "webrender_traits 0.4.0 (git+https://github.com/servo/webrender)",
+ "webrender_traits 0.5.1 (git+https://github.com/servo/webrender)",
 ]

 [[package]]
@ -664,7 +664,7 @@ dependencies = [

 [[package]]
 name = "euclid"
-version = "0.9.0"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
@ -758,13 +758,13 @@ name = "gfx"
 version = "0.0.1"
 dependencies = [
 "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "azure 0.7.1 (git+https://github.com/servo/rust-azure)",
+ "azure 0.8.0 (git+https://github.com/servo/rust-azure)",
 "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "byteorder 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "core-graphics 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "core-text 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "fnv 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "freetype 0.1.0 (git+https://github.com/servo/rust-freetype)",
 "gfx_traits 0.0.1",
@ -772,7 +772,7 @@ dependencies = [
 "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "heapsize_plugin 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
 "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "layers 0.4.0 (git+https://github.com/servo/rust-layers)",
+ "layers 0.5.1 (git+https://github.com/servo/rust-layers)",
 "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "libc 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
@ -797,7 +797,7 @@ dependencies = [
 "unicode-script 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "util 0.0.1",
- "webrender_traits 0.4.0 (git+https://github.com/servo/webrender)",
+ "webrender_traits 0.5.1 (git+https://github.com/servo/webrender)",
 "xi-unicode 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@ -814,11 +814,11 @@ dependencies = [
 name = "gfx_traits"
 version = "0.0.1"
 dependencies = [
- "azure 0.7.1 (git+https://github.com/servo/rust-azure)",
- "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "azure 0.8.0 (git+https://github.com/servo/rust-azure)",
+ "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "heapsize_plugin 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "layers 0.4.0 (git+https://github.com/servo/rust-layers)",
+ "layers 0.5.1 (git+https://github.com/servo/rust-layers)",
 "msg 0.0.1",
 "plugins 0.0.1",
 "profile_traits 0.0.1",
@ -866,10 +866,10 @@ version = "0.0.1"
 dependencies = [
 "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "compositing 0.0.1",
- "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "gdi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "gleam 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)",
- "layers 0.4.0 (git+https://github.com/servo/rust-layers)",
+ "layers 0.5.1 (git+https://github.com/servo/rust-layers)",
 "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "msg 0.0.1",
 "net_traits 0.0.1",
@ -1043,12 +1043,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
 name = "io-surface"
-version = "0.4.0"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "cgl 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "gleam 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)",
 "leaky-cow 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "libc 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1116,22 +1115,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
 name = "layers"
-version = "0.4.0"
-source = "git+https://github.com/servo/rust-layers#614d62f48a258cd94f6cf2c6500cd7801e340981"
+version = "0.5.1"
+source = "git+https://github.com/servo/rust-layers#9b90d76cf0bc108ef6b29dab42d2ea36dbd718f8"
 dependencies = [
 "cgl 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "gleam 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)",
 "glx 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "heapsize_plugin 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "io-surface 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "io-surface 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "libc 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
 "servo-egl 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "servo-skia 0.20130412.22 (registry+https://github.com/rust-lang/crates.io-index)",
+ "servo-skia 0.20130412.23 (registry+https://github.com/rust-lang/crates.io-index)",
 "x11 2.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@ -1140,11 +1139,11 @@ name = "layout"
 version = "0.0.1"
 dependencies = [
 "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "azure 0.7.1 (git+https://github.com/servo/rust-azure)",
+ "azure 0.8.0 (git+https://github.com/servo/rust-azure)",
 "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "canvas_traits 0.0.1",
 "cssparser 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "fnv 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "gfx 0.0.1",
 "gfx_traits 0.0.1",
@ -1172,7 +1171,7 @@ dependencies = [
 "unicode-script 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "util 0.0.1",
- "webrender_traits 0.4.0 (git+https://github.com/servo/webrender)",
+ "webrender_traits 0.5.1 (git+https://github.com/servo/webrender)",
 ]

 [[package]]
@ -1187,8 +1186,8 @@ name = "layout_thread"
 version = "0.0.1"
 dependencies = [
 "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "azure 0.7.1 (git+https://github.com/servo/rust-azure)",
- "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "azure 0.8.0 (git+https://github.com/servo/rust-azure)",
+ "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "fnv 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "gfx 0.0.1",
 "gfx_traits 0.0.1",
@ -1210,7 +1209,7 @@ dependencies = [
 "style 0.0.1",
 "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "util 0.0.1",
- "webrender_traits 0.4.0 (git+https://github.com/servo/webrender)",
+ "webrender_traits 0.5.1 (git+https://github.com/servo/webrender)",
 ]

 [[package]]
@ -1225,7 +1224,7 @@ dependencies = [
 "script_traits 0.0.1",
 "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "util 0.0.1",
- "webrender_traits 0.4.0 (git+https://github.com/servo/webrender)",
+ "webrender_traits 0.5.1 (git+https://github.com/servo/webrender)",
 ]

 [[package]]
@ -1384,7 +1383,7 @@ dependencies = [
 "serde 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_macros 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "webrender_traits 0.4.0 (git+https://github.com/servo/webrender)",
+ "webrender_traits 0.5.1 (git+https://github.com/servo/webrender)",
 ]

 [[package]]
@ -1422,7 +1421,7 @@ dependencies = [
 "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "util 0.0.1",
 "uuid 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "webrender_traits 0.4.0 (git+https://github.com/servo/webrender)",
+ "webrender_traits 0.5.1 (git+https://github.com/servo/webrender)",
 "websocket 0.17.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@ -1575,12 +1574,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
 name = "offscreen_gl_context"
-version = "0.3.0"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "cgl 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "gl_generator 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "gleam 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)",
 "khronos_api 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1899,7 +1898,7 @@ dependencies = [
 "cssparser 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)",
 "devtools_traits 0.0.1",
 "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
- "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "fnv 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "gfx_traits 0.0.1",
 "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1917,7 +1916,7 @@ dependencies = [
 "msg 0.0.1",
 "net_traits 0.0.1",
 "num-traits 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
- "offscreen_gl_context 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "offscreen_gl_context 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "open 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "phf 0.7.16 (registry+https://github.com/rust-lang/crates.io-index)",
 "phf_macros 0.7.16 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1941,7 +1940,7 @@ dependencies = [
 "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "util 0.0.1",
 "uuid 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "webrender_traits 0.4.0 (git+https://github.com/servo/webrender)",
+ "webrender_traits 0.5.1 (git+https://github.com/servo/webrender)",
 "websocket 0.17.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "xml5ever 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -1954,7 +1953,7 @@ dependencies = [
 "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "canvas_traits 0.0.1",
 "cssparser 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "gfx_traits 0.0.1",
 "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "heapsize_plugin 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1992,17 +1991,17 @@ dependencies = [
 "canvas_traits 0.0.1",
 "cookie 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
 "devtools_traits 0.0.1",
- "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "gfx_traits 0.0.1",
 "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "heapsize_plugin 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
 "hyper_serde 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "layers 0.4.0 (git+https://github.com/servo/rust-layers)",
+ "layers 0.5.1 (git+https://github.com/servo/rust-layers)",
 "libc 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
 "msg 0.0.1",
 "net_traits 0.0.1",
- "offscreen_gl_context 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "offscreen_gl_context 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "plugins 0.0.1",
 "profile_traits 0.0.1",
 "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
@ -2142,16 +2141,16 @@ dependencies = [

 [[package]]
 name = "servo-skia"
-version = "0.20130412.22"
+version = "0.20130412.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "cgl 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "cmake 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
- "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "expat-sys 2.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "gleam 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)",
 "glx 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "io-surface 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "io-surface 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "libc 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
 "servo-egl 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "servo-fontconfig-sys 4.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
@ -2224,7 +2223,7 @@ dependencies = [
 "cssparser 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)",
 "deque 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
- "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "fnv 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "heapsize_plugin 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
@ -2256,7 +2255,7 @@ version = "0.0.1"
 dependencies = [
 "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "cssparser 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
 "selectors 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "string_cache 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)",
@ -2271,7 +2270,7 @@ name = "style_traits"
 version = "0.0.1"
 dependencies = [
 "cssparser 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "heapsize_plugin 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
 "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
@ -2447,7 +2446,7 @@ version = "0.0.1"
 dependencies = [
 "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "getopts 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",
 "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
@ -2560,7 +2559,7 @@ name = "webdriver_server"
 version = "0.0.1"
 dependencies = [
 "cookie 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "hyper 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)",
 "image 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
@ -2578,15 +2577,16 @@ dependencies = [

 [[package]]
 name = "webrender"
-version = "0.4.0"
-source = "git+https://github.com/servo/webrender#b8b719ad5d69249093f505cec8a7d5dac344b802"
+version = "0.5.1"
+source = "git+https://github.com/servo/webrender#1c907208bcd4ad14f651383417a7031de92de6d4"
 dependencies = [
 "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bincode 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "bit-set 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "byteorder 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "core-graphics 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "core-text 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "fnv 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "freetype 0.1.0 (git+https://github.com/servo/rust-freetype)",
 "gleam 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)",
@ -2594,25 +2594,25 @@ dependencies = [
 "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "num-traits 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
- "offscreen_gl_context 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "offscreen_gl_context 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "rayon 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)",
- "webrender_traits 0.4.0 (git+https://github.com/servo/webrender)",
+ "webrender_traits 0.5.1 (git+https://github.com/servo/webrender)",
 ]

 [[package]]
 name = "webrender_traits"
-version = "0.4.0"
-source = "git+https://github.com/servo/webrender#b8b719ad5d69249093f505cec8a7d5dac344b802"
+version = "0.5.1"
+source = "git+https://github.com/servo/webrender#1c907208bcd4ad14f651383417a7031de92de6d4"
 dependencies = [
 "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "byteorder 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "core-graphics 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "gleam 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)",
 "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "offscreen_gl_context 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "offscreen_gl_context 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_macros 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
--- a/components/servo/Cargo.toml
+++ b/components/servo/Cargo.toml
@ -52,7 +52,7 @@ constellation = {path = "../constellation"}
 devtools = {path = "../devtools"}
 devtools_traits = {path = "../devtools_traits"}
 env_logger = "0.3"
-euclid = "0.9"
+euclid = "0.10.1"
 gfx = {path = "../gfx"}
 gleam = "0.2"
 glutin_app = {path = "../../ports/glutin"}
--- a/components/servo/lib.rs
+++ b/components/servo/lib.rs
@ -151,6 +151,7 @@ impl<Window> Browser<Window> where Window: WindowMethods + 'static {
                        enable_msaa: opts.use_msaa,
                        enable_profiler: opts.webrender_stats,
                        debug: opts.webrender_debug,
+                        enable_recording: false,
                    });
                (Some(webrender), Some(webrender_sender))
            } else {
--- a/components/style/Cargo.toml
+++ b/components/style/Cargo.toml
@ -25,7 +25,7 @@ bitflags = "0.7"
 cssparser = "0.5.7"
 deque = "0.3.1"
 encoding = "0.2"
-euclid = "0.9"
+euclid = "0.10.1"
 fnv = "1.0"
 gecko_bindings = {path = "../../ports/geckolib/gecko_bindings", optional = true}
 gecko_string_cache = {path = "../../ports/geckolib/string_cache", optional = true}
--- a/components/style/properties/helpers/animated_properties.mako.rs
+++ b/components/style/properties/helpers/animated_properties.mako.rs
@ -242,7 +242,7 @@ impl Interpolate for ZIndex {
    }
 }

-impl<T: Interpolate + Clone> Interpolate for Size2D<T> {
+impl<T: Interpolate + Copy> Interpolate for Size2D<T> {
    #[inline]
    fn interpolate(&self, other: &Self, time: f64) -> Result<Self, ()> {
        let width = try!(self.width.interpolate(&other.width, time));
@ -252,7 +252,7 @@ impl<T: Interpolate + Clone> Interpolate for Size2D<T> {
    }
 }

-impl<T: Interpolate + Clone> Interpolate for Point2D<T> {
+impl<T: Interpolate + Copy> Interpolate for Point2D<T> {
    #[inline]
    fn interpolate(&self, other: &Self, time: f64) -> Result<Self, ()> {
        let x = try!(self.x.interpolate(&other.x, time));
--- a/components/style_traits/Cargo.toml
+++ b/components/style_traits/Cargo.toml
@ -15,7 +15,7 @@ servo = ["heapsize", "heapsize_plugin", "serde", "serde_macros",

 [dependencies]
 cssparser = "0.5.7"
-euclid = "0.9"
+euclid = "0.10.1"
 heapsize = {version = "0.3.0", optional = true}
 heapsize_plugin = {version = "0.1.2", optional = true}
 rustc-serialize = "0.3"
--- a/components/util/Cargo.toml
+++ b/components/util/Cargo.toml
@ -17,7 +17,7 @@ servo = ["serde", "serde_macros", "ipc-channel", "app_units/plugins",
 [dependencies]
 app_units = "0.3"
 bitflags = "0.7"
-euclid = "0.9"
+euclid = "0.10.1"
 getopts = "0.2.11"
 heapsize = "0.3.0"
 ipc-channel = {version = "0.5", optional = true}
--- a/components/webdriver_server/Cargo.toml
+++ b/components/webdriver_server/Cargo.toml
@ -10,7 +10,7 @@ name = "webdriver_server"
 path = "lib.rs"

 [dependencies]
-euclid = "0.9"
+euclid = "0.10.1"
 hyper = "0.9.9"
 image = "0.10"
 ipc-channel = "0.5"
--- a/ports/cef/Cargo.lock
+++ b/ports/cef/Cargo.lock
@ -5,10 +5,10 @@ dependencies = [
 "cocoa 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "compositing 0.0.1",
 "devtools 0.0.1",
- "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "gleam 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)",
 "glutin_app 0.0.1",
- "layers 0.4.0 (git+https://github.com/servo/rust-layers)",
+ "layers 0.5.1 (git+https://github.com/servo/rust-layers)",
 "libc 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "msg 0.0.1",
@ -77,14 +77,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
 name = "azure"
-version = "0.7.1"
-source = "git+https://github.com/servo/rust-azure#d5ca43ba0e1e0fc33832060728d7ed60520541f8"
+version = "0.8.0"
+source = "git+https://github.com/servo/rust-azure#9fb666b2fc86b23761f9b0f877a3d42f182263a9"
 dependencies = [
 "cmake 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
 "core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "core-graphics 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "core-text 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "freetype 0.1.0 (git+https://github.com/servo/rust-freetype)",
 "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "heapsize_plugin 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
@ -93,7 +93,7 @@ dependencies = [
 "serde_macros 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "servo-egl 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "servo-freetype-sys 4.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "servo-skia 0.20130412.22 (registry+https://github.com/rust-lang/crates.io-index)",
+ "servo-skia 0.20130412.23 (registry+https://github.com/rust-lang/crates.io-index)",
 "x11 2.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@ -185,27 +185,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 name = "canvas"
 version = "0.0.1"
 dependencies = [
- "azure 0.7.1 (git+https://github.com/servo/rust-azure)",
+ "azure 0.8.0 (git+https://github.com/servo/rust-azure)",
 "canvas_traits 0.0.1",
- "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "gfx_traits 0.0.1",
 "gleam 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)",
 "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "num-traits 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
- "offscreen_gl_context 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "offscreen_gl_context 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "plugins 0.0.1",
 "util 0.0.1",
- "webrender_traits 0.4.0 (git+https://github.com/servo/webrender)",
+ "webrender_traits 0.5.1 (git+https://github.com/servo/webrender)",
 ]

 [[package]]
 name = "canvas_traits"
 version = "0.0.1"
 dependencies = [
- "azure 0.7.1 (git+https://github.com/servo/rust-azure)",
+ "azure 0.8.0 (git+https://github.com/servo/rust-azure)",
 "cssparser 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "gfx_traits 0.0.1",
 "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "heapsize_plugin 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
@ -213,7 +213,7 @@ dependencies = [
 "plugins 0.0.1",
 "serde 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_macros 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "webrender_traits 0.4.0 (git+https://github.com/servo/webrender)",
+ "webrender_traits 0.5.1 (git+https://github.com/servo/webrender)",
 ]

 [[package]]
@ -269,13 +269,13 @@ name = "compositing"
 version = "0.0.1"
 dependencies = [
 "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "azure 0.7.1 (git+https://github.com/servo/rust-azure)",
- "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "azure 0.8.0 (git+https://github.com/servo/rust-azure)",
+ "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "gfx_traits 0.0.1",
 "gleam 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)",
 "image 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "layers 0.4.0 (git+https://github.com/servo/rust-layers)",
+ "layers 0.5.1 (git+https://github.com/servo/rust-layers)",
 "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "msg 0.0.1",
 "net_traits 0.0.1",
@ -288,8 +288,8 @@ dependencies = [
 "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)",
 "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "util 0.0.1",
- "webrender 0.4.0 (git+https://github.com/servo/webrender)",
- "webrender_traits 0.4.0 (git+https://github.com/servo/webrender)",
+ "webrender 0.5.1 (git+https://github.com/servo/webrender)",
+ "webrender_traits 0.5.1 (git+https://github.com/servo/webrender)",
 ]

 [[package]]
@ -301,17 +301,17 @@ dependencies = [
 "canvas_traits 0.0.1",
 "compositing 0.0.1",
 "devtools_traits 0.0.1",
- "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "gaol 0.0.1 (git+https://github.com/servo/gaol)",
 "gfx 0.0.1",
 "gfx_traits 0.0.1",
 "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "layers 0.4.0 (git+https://github.com/servo/rust-layers)",
+ "layers 0.5.1 (git+https://github.com/servo/rust-layers)",
 "layout_traits 0.0.1",
 "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "msg 0.0.1",
 "net_traits 0.0.1",
- "offscreen_gl_context 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "offscreen_gl_context 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "plugins 0.0.1",
 "profile_traits 0.0.1",
 "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
@ -321,7 +321,7 @@ dependencies = [
 "style_traits 0.0.1",
 "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "util 0.0.1",
- "webrender_traits 0.4.0 (git+https://github.com/servo/webrender)",
+ "webrender_traits 0.5.1 (git+https://github.com/servo/webrender)",
 ]

 [[package]]
@ -581,7 +581,7 @@ dependencies = [

 [[package]]
 name = "euclid"
-version = "0.9.0"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
@ -675,13 +675,13 @@ name = "gfx"
 version = "0.0.1"
 dependencies = [
 "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "azure 0.7.1 (git+https://github.com/servo/rust-azure)",
+ "azure 0.8.0 (git+https://github.com/servo/rust-azure)",
 "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "byteorder 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "core-graphics 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "core-text 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "fnv 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "freetype 0.1.0 (git+https://github.com/servo/rust-freetype)",
 "gfx_traits 0.0.1",
@ -689,7 +689,7 @@ dependencies = [
 "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "heapsize_plugin 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
 "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "layers 0.4.0 (git+https://github.com/servo/rust-layers)",
+ "layers 0.5.1 (git+https://github.com/servo/rust-layers)",
 "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "libc 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
@ -714,7 +714,7 @@ dependencies = [
 "unicode-script 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "util 0.0.1",
- "webrender_traits 0.4.0 (git+https://github.com/servo/webrender)",
+ "webrender_traits 0.5.1 (git+https://github.com/servo/webrender)",
 "xi-unicode 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@ -722,11 +722,11 @@ dependencies = [
 name = "gfx_traits"
 version = "0.0.1"
 dependencies = [
- "azure 0.7.1 (git+https://github.com/servo/rust-azure)",
- "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "azure 0.8.0 (git+https://github.com/servo/rust-azure)",
+ "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "heapsize_plugin 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "layers 0.4.0 (git+https://github.com/servo/rust-layers)",
+ "layers 0.5.1 (git+https://github.com/servo/rust-layers)",
 "msg 0.0.1",
 "plugins 0.0.1",
 "profile_traits 0.0.1",
@ -774,10 +774,10 @@ version = "0.0.1"
 dependencies = [
 "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "compositing 0.0.1",
- "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "gdi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "gleam 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)",
- "layers 0.4.0 (git+https://github.com/servo/rust-layers)",
+ "layers 0.5.1 (git+https://github.com/servo/rust-layers)",
 "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "msg 0.0.1",
 "net_traits 0.0.1",
@ -951,12 +951,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
 name = "io-surface"
-version = "0.4.0"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "cgl 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "gleam 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)",
 "leaky-cow 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "libc 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1024,22 +1023,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
 name = "layers"
-version = "0.4.0"
-source = "git+https://github.com/servo/rust-layers#614d62f48a258cd94f6cf2c6500cd7801e340981"
+version = "0.5.1"
+source = "git+https://github.com/servo/rust-layers#9b90d76cf0bc108ef6b29dab42d2ea36dbd718f8"
 dependencies = [
 "cgl 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "gleam 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)",
 "glx 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "heapsize_plugin 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "io-surface 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "io-surface 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "libc 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
 "servo-egl 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "servo-skia 0.20130412.22 (registry+https://github.com/rust-lang/crates.io-index)",
+ "servo-skia 0.20130412.23 (registry+https://github.com/rust-lang/crates.io-index)",
 "x11 2.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@ -1048,11 +1047,11 @@ name = "layout"
 version = "0.0.1"
 dependencies = [
 "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "azure 0.7.1 (git+https://github.com/servo/rust-azure)",
+ "azure 0.8.0 (git+https://github.com/servo/rust-azure)",
 "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "canvas_traits 0.0.1",
 "cssparser 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "fnv 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "gfx 0.0.1",
 "gfx_traits 0.0.1",
@ -1080,7 +1079,7 @@ dependencies = [
 "unicode-script 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "util 0.0.1",
- "webrender_traits 0.4.0 (git+https://github.com/servo/webrender)",
+ "webrender_traits 0.5.1 (git+https://github.com/servo/webrender)",
 ]

 [[package]]
@ -1088,8 +1087,8 @@ name = "layout_thread"
 version = "0.0.1"
 dependencies = [
 "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "azure 0.7.1 (git+https://github.com/servo/rust-azure)",
- "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "azure 0.8.0 (git+https://github.com/servo/rust-azure)",
+ "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "fnv 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "gfx 0.0.1",
 "gfx_traits 0.0.1",
@ -1111,7 +1110,7 @@ dependencies = [
 "style 0.0.1",
 "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "util 0.0.1",
- "webrender_traits 0.4.0 (git+https://github.com/servo/webrender)",
+ "webrender_traits 0.5.1 (git+https://github.com/servo/webrender)",
 ]

 [[package]]
@ -1126,7 +1125,7 @@ dependencies = [
 "script_traits 0.0.1",
 "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "util 0.0.1",
- "webrender_traits 0.4.0 (git+https://github.com/servo/webrender)",
+ "webrender_traits 0.5.1 (git+https://github.com/servo/webrender)",
 ]

 [[package]]
@ -1285,7 +1284,7 @@ dependencies = [
 "serde 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_macros 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "webrender_traits 0.4.0 (git+https://github.com/servo/webrender)",
+ "webrender_traits 0.5.1 (git+https://github.com/servo/webrender)",
 ]

 [[package]]
@ -1323,7 +1322,7 @@ dependencies = [
 "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "util 0.0.1",
 "uuid 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "webrender_traits 0.4.0 (git+https://github.com/servo/webrender)",
+ "webrender_traits 0.5.1 (git+https://github.com/servo/webrender)",
 "websocket 0.17.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@ -1447,12 +1446,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
 name = "offscreen_gl_context"
-version = "0.3.0"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "cgl 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "gl_generator 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "gleam 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)",
 "khronos_api 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1751,7 +1750,7 @@ dependencies = [
 "cssparser 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)",
 "devtools_traits 0.0.1",
 "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
- "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "fnv 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "gfx_traits 0.0.1",
 "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1769,7 +1768,7 @@ dependencies = [
 "msg 0.0.1",
 "net_traits 0.0.1",
 "num-traits 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
- "offscreen_gl_context 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "offscreen_gl_context 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "open 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "phf 0.7.16 (registry+https://github.com/rust-lang/crates.io-index)",
 "phf_macros 0.7.16 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1793,7 +1792,7 @@ dependencies = [
 "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "util 0.0.1",
 "uuid 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "webrender_traits 0.4.0 (git+https://github.com/servo/webrender)",
+ "webrender_traits 0.5.1 (git+https://github.com/servo/webrender)",
 "websocket 0.17.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "xml5ever 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -1806,7 +1805,7 @@ dependencies = [
 "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "canvas_traits 0.0.1",
 "cssparser 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "gfx_traits 0.0.1",
 "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "heapsize_plugin 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1834,17 +1833,17 @@ dependencies = [
 "canvas_traits 0.0.1",
 "cookie 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
 "devtools_traits 0.0.1",
- "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "gfx_traits 0.0.1",
 "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "heapsize_plugin 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
 "hyper_serde 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "layers 0.4.0 (git+https://github.com/servo/rust-layers)",
+ "layers 0.5.1 (git+https://github.com/servo/rust-layers)",
 "libc 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
 "msg 0.0.1",
 "net_traits 0.0.1",
- "offscreen_gl_context 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "offscreen_gl_context 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "plugins 0.0.1",
 "profile_traits 0.0.1",
 "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1931,7 +1930,7 @@ dependencies = [
 "devtools 0.0.1",
 "devtools_traits 0.0.1",
 "env_logger 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "gaol 0.0.1 (git+https://github.com/servo/gaol)",
 "gfx 0.0.1",
 "gleam 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1954,8 +1953,8 @@ dependencies = [
 "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "util 0.0.1",
 "webdriver_server 0.0.1",
- "webrender 0.4.0 (git+https://github.com/servo/webrender)",
- "webrender_traits 0.4.0 (git+https://github.com/servo/webrender)",
+ "webrender 0.5.1 (git+https://github.com/servo/webrender)",
+ "webrender_traits 0.5.1 (git+https://github.com/servo/webrender)",
 ]

 [[package]]
@ -2025,16 +2024,16 @@ dependencies = [

 [[package]]
 name = "servo-skia"
-version = "0.20130412.22"
+version = "0.20130412.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "cgl 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "cmake 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
- "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "expat-sys 2.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "gleam 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)",
 "glx 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "io-surface 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "io-surface 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "libc 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
 "servo-egl 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "servo-fontconfig-sys 4.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
@ -2107,7 +2106,7 @@ dependencies = [
 "cssparser 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)",
 "deque 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
- "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "fnv 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "heapsize_plugin 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
@ -2138,7 +2137,7 @@ name = "style_traits"
 version = "0.0.1"
 dependencies = [
 "cssparser 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "heapsize_plugin 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
 "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
@ -2314,7 +2313,7 @@ version = "0.0.1"
 dependencies = [
 "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "getopts 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",
 "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
@ -2420,7 +2419,7 @@ name = "webdriver_server"
 version = "0.0.1"
 dependencies = [
 "cookie 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "hyper 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)",
 "image 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
@ -2438,15 +2437,16 @@ dependencies = [

 [[package]]
 name = "webrender"
-version = "0.4.0"
-source = "git+https://github.com/servo/webrender#b8b719ad5d69249093f505cec8a7d5dac344b802"
+version = "0.5.1"
+source = "git+https://github.com/servo/webrender#1c907208bcd4ad14f651383417a7031de92de6d4"
 dependencies = [
 "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bincode 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "bit-set 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "byteorder 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "core-graphics 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "core-text 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "fnv 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "freetype 0.1.0 (git+https://github.com/servo/rust-freetype)",
 "gleam 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)",
@ -2454,25 +2454,25 @@ dependencies = [
 "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "num-traits 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
- "offscreen_gl_context 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "offscreen_gl_context 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "rayon 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)",
- "webrender_traits 0.4.0 (git+https://github.com/servo/webrender)",
+ "webrender_traits 0.5.1 (git+https://github.com/servo/webrender)",
 ]

 [[package]]
 name = "webrender_traits"
-version = "0.4.0"
-source = "git+https://github.com/servo/webrender#b8b719ad5d69249093f505cec8a7d5dac344b802"
+version = "0.5.1"
+source = "git+https://github.com/servo/webrender#1c907208bcd4ad14f651383417a7031de92de6d4"
 dependencies = [
 "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "byteorder 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "core-graphics 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "gleam 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)",
 "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "offscreen_gl_context 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "offscreen_gl_context 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_macros 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
--- a/ports/cef/Cargo.toml
+++ b/ports/cef/Cargo.toml
@ -17,7 +17,7 @@ opt-level = 3
 [dependencies]
 compositing = {path = "../../components/compositing"}
 devtools = {path = "../../components/devtools"}
-euclid = "0.9"
+euclid = "0.10.1"
 gleam = "0.2.8"
 glutin_app = {path = "../glutin"}
 layers = {git = "https://github.com/servo/rust-layers"}
--- a/ports/geckolib/Cargo.lock
+++ b/ports/geckolib/Cargo.lock
@ -4,7 +4,7 @@ version = "0.0.1"
 dependencies = [
 "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "env_logger 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "gecko_bindings 0.0.1",
 "gecko_string_cache 0.2.20",
 "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
@ -140,7 +140,7 @@ dependencies = [

 [[package]]
 name = "euclid"
-version = "0.9.0"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
@ -354,7 +354,7 @@ dependencies = [
 "cssparser 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)",
 "deque 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
- "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "fnv 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "gecko_bindings 0.0.1",
 "gecko_string_cache 0.2.20",
@ -381,7 +381,7 @@ name = "style_traits"
 version = "0.0.1"
 dependencies = [
 "cssparser 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@ -453,7 +453,7 @@ version = "0.0.1"
 dependencies = [
 "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "getopts 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",
 "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
--- a/ports/geckolib/Cargo.toml
+++ b/ports/geckolib/Cargo.toml
@ -12,7 +12,7 @@ crate-type = ["staticlib"]
 [dependencies]
 app_units = "0.3"
 env_logger = "0.3"
-euclid = "0.9"
+euclid = "0.10.1"
 gecko_bindings = {version = "0.0.1", path = "gecko_bindings"}
 gecko_string_cache = {path = "string_cache"}
 lazy_static = "0.2"
--- a/ports/glutin/Cargo.toml
+++ b/ports/glutin/Cargo.toml
@ -11,7 +11,7 @@ path = "lib.rs"
 [dependencies]
 bitflags = "0.7"
 compositing = {path = "../../components/compositing"}
-euclid = "0.9"
+euclid = "0.10.1"
 gleam = "0.2.8"
 layers = {git = "https://github.com/servo/rust-layers", features = ["plugins"]}
 log = "0.3.5"
--- a/ports/glutin/window.rs
+++ b/ports/glutin/window.rs
@ -125,8 +125,8 @@ impl Window {
               window_size: TypedSize2D<u32, ScreenPx>,
               parent: Option<glutin::WindowID>) -> Rc<Window> {
        let win_size: TypedSize2D<u32, DevicePixel> =
-            (window_size.as_f32() * window_creation_scale_factor())
-            .as_uint().cast().expect("Window size should fit in u32");
+            (window_size.to_f32() * window_creation_scale_factor())
+                .to_uint().cast().expect("Window size should fit in u32");
        let width = win_size.to_untyped().width;
        let height = win_size.to_untyped().height;

@ -886,7 +886,7 @@ impl WindowMethods for Window {
            (NONE, Some(' '), _) => {
                self.scroll_window(0.0,
                                   -self.framebuffer_size()
-                                        .as_f32()
+                                        .to_f32()
                                        .to_untyped()
                                        .height + 2.0 * LINE_HEIGHT,
                                   TouchEventType::Move);
@ -895,7 +895,7 @@ impl WindowMethods for Window {
            (SHIFT, Some(' '), _) => {
                self.scroll_window(0.0,
                                   self.framebuffer_size()
-                                       .as_f32()
+                                       .to_f32()
                                       .to_untyped()
                                       .height - 2.0 * LINE_HEIGHT,
                                   TouchEventType::Move);
--- a/tests/unit/style/Cargo.toml
+++ b/tests/unit/style/Cargo.toml
@ -12,7 +12,7 @@ doctest = false
 [dependencies]
 app_units = "0.3"
 cssparser = {version = "0.5.7", features = ["heap_size"]}
-euclid = "0.9"
+euclid = "0.10.1"
 rustc-serialize = "0.3"
 selectors = {version = "0.11", features = ["heap_size"]}
 string_cache = {version = "0.2.23", features = ["heap_size"]}
--- a/tests/wpt/metadata-css/css-transforms-1_dev/html/transform3d-scale-004.htm.ini
+++ b/tests/wpt/metadata-css/css-transforms-1_dev/html/transform3d-scale-004.htm.ini
@ -1,3 +0,0 @@
-[transform3d-scale-004.htm]
-  type: reftest
-  expected: FAIL