10 files changed, 19 insertions, 21 deletions
diff --git a/components/gfx/Cargo.toml b/components/gfx/Cargo.toml
index 5b5bc001086..5e8cc732564 100644
--- a/components/gfx/Cargo.toml
+++ b/components/gfx/Cargo.toml
@@ -35,9 +35,6 @@ path = "../style"
 [dependencies.azure]
 git = "https://github.com/servo/rust-azure"
 
-[dependencies.geom]
-git = "https://github.com/servo/rust-geom"
-
 [dependencies.layers]
 git = "https://github.com/servo/rust-layers"
 
@@ -65,6 +62,7 @@ rand = "*"
 harfbuzz = "0.1"
 smallvec = "0.1"
 string_cache = "0.1"
+euclid = "0.1"
 
 [target.x86_64-apple-darwin.dependencies]
 core-foundation = "*"
diff --git a/components/gfx/buffer_map.rs b/components/gfx/buffer_map.rs
index a3d210627d1..353e2969be6 100644
--- a/components/gfx/buffer_map.rs
+++ b/components/gfx/buffer_map.rs
@@ -4,7 +4,7 @@
 
 use std::collections::HashMap;
 use std::collections::hash_map::Entry::{Occupied, Vacant};
-use geom::size::Size2D;
+use euclid::size::Size2D;
 use layers::platform::surface::NativePaintingGraphicsContext;
 use layers::layers::LayerBuffer;
 use std::hash::{Hash, Hasher};
diff --git a/components/gfx/display_list/mod.rs b/components/gfx/display_list/mod.rs
index bf2c839bc7e..22ca879b417 100644
--- a/components/gfx/display_list/mod.rs
+++ b/components/gfx/display_list/mod.rs
@@ -27,9 +27,9 @@ use azure::azure::AzFloat;
 use azure::azure_hl::Color;
 
 use std::collections::linked_list::{self, LinkedList};
-use geom::{Point2D, Rect, SideOffsets2D, Size2D, Matrix2D, Matrix4};
-use geom::approxeq::ApproxEq;
-use geom::num::Zero;
+use euclid::{Point2D, Rect, SideOffsets2D, Size2D, Matrix2D, Matrix4};
+use euclid::approxeq::ApproxEq;
+use euclid::num::Zero;
 use libc::uintptr_t;
 use paint_task::PaintLayer;
 use msg::compositor_msg::LayerId;
diff --git a/components/gfx/display_list/optimizer.rs b/components/gfx/display_list/optimizer.rs
index 07d048c8c9c..d7a5297dd1f 100644
--- a/components/gfx/display_list/optimizer.rs
+++ b/components/gfx/display_list/optimizer.rs
@@ -7,7 +7,7 @@
 use display_list::{DisplayItem, DisplayList, StackingContext};
 
 use std::collections::linked_list::LinkedList;
-use geom::rect::Rect;
+use euclid::rect::Rect;
 use util::geometry::{self, Au};
 use std::sync::Arc;
 
diff --git a/components/gfx/font.rs b/components/gfx/font.rs
index d06540a9657..824523be4bd 100644
--- a/components/gfx/font.rs
+++ b/components/gfx/font.rs
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-use geom::{Point2D, Rect, Size2D};
+use euclid::{Point2D, Rect, Size2D};
 use smallvec::SmallVec8;
 use std::borrow::ToOwned;
 use std::mem;
diff --git a/components/gfx/lib.rs b/components/gfx/lib.rs
index 3117c8f7a6d..4acd4ef0aa7 100644
--- a/components/gfx/lib.rs
+++ b/components/gfx/lib.rs
@@ -20,7 +20,7 @@ extern crate alloc;
 extern crate azure;
 #[macro_use] extern crate bitflags;
 extern crate fnv;
-extern crate geom;
+extern crate euclid;
 extern crate layers;
 extern crate libc;
 extern crate stb_image;
diff --git a/components/gfx/paint_context.rs b/components/gfx/paint_context.rs
index 04551f08170..2098b5c9c19 100644
--- a/components/gfx/paint_context.rs
+++ b/components/gfx/paint_context.rs
@@ -23,11 +23,11 @@ use azure::azure_hl::{Pattern, PatternRef, Path, PathBuilder, CompositionOp, Ant
 use azure::scaled_font::ScaledFont;
 use azure::{AzFloat, struct__AzDrawOptions, struct__AzGlyph};
 use azure::{struct__AzGlyphBuffer, struct__AzPoint, AzDrawTargetFillGlyphs};
-use geom::matrix2d::Matrix2D;
-use geom::point::Point2D;
-use geom::rect::Rect;
-use geom::side_offsets::SideOffsets2D;
-use geom::size::Size2D;
+use euclid::matrix2d::Matrix2D;
+use euclid::point::Point2D;
+use euclid::rect::Rect;
+use euclid::side_offsets::SideOffsets2D;
+use euclid::size::Size2D;
 use libc::types::common::c99::uint32_t;
 use net_traits::image::base::Image;
 use png::PixelsByColorType;
diff --git a/components/gfx/paint_task.rs b/components/gfx/paint_task.rs
index f640f56a541..b711b14e98e 100644
--- a/components/gfx/paint_task.rs
+++ b/components/gfx/paint_task.rs
@@ -12,10 +12,10 @@ use paint_context::PaintContext;
 
 use azure::azure_hl::{SurfaceFormat, Color, DrawTarget, BackendType};
 use azure::AzFloat;
-use geom::Matrix4;
-use geom::point::Point2D;
-use geom::rect::Rect;
-use geom::size::Size2D;
+use euclid::Matrix4;
+use euclid::point::Point2D;
+use euclid::rect::Rect;
+use euclid::size::Size2D;
 use layers::platform::surface::{NativeGraphicsMetadata, NativePaintingGraphicsContext};
 use layers::platform::surface::NativeSurface;
 use layers::layers::{BufferRequest, LayerBuffer, LayerBufferSet};
diff --git a/components/gfx/text/glyph.rs b/components/gfx/text/glyph.rs
index bc900960be9..ecc6374bedc 100644
--- a/components/gfx/text/glyph.rs
+++ b/components/gfx/text/glyph.rs
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-use geom::point::Point2D;
+use euclid::point::Point2D;
 use std::cmp::{Ordering, PartialOrd};
 use std::iter::repeat;
 use std::mem;
diff --git a/components/gfx/text/shaping/harfbuzz.rs b/components/gfx/text/shaping/harfbuzz.rs
index 3ab0582cac5..5850a5a3ab8 100644
--- a/components/gfx/text/shaping/harfbuzz.rs
+++ b/components/gfx/text/shaping/harfbuzz.rs
@@ -11,7 +11,7 @@ use text::glyph::{CharIndex, GlyphStore, GlyphId, GlyphData};
 use text::shaping::ShaperMethods;
 use text::util::{float_to_fixed, fixed_to_float};
 
-use geom::Point2D;
+use euclid::Point2D;
 use harfbuzz::{HB_MEMORY_MODE_READONLY, HB_DIRECTION_LTR};
 use harfbuzz::{RUST_hb_blob_create, RUST_hb_face_create_for_tables};
 use harfbuzz::{hb_blob_t};