Move the gfx::geometry module to servo_util::geometry.

This is part of #1006, in order to use Au from the script crate
without introducing a circular crate dependency.

src/components/gfx/display_list.rs

@@ -15,7 +15,7 @@
 /// low-level drawing primitives.
 
 use color::Color;
-use geometry::Au;
+use servo_util::geometry::Au;
 use newcss::values::CSSBorderStyle;
 use render_context::RenderContext;
 use text::SendableTextRun;

src/components/gfx/font.rs

@@ -4,7 +4,7 @@
 
 use color::Color;
 use font_context::FontContext;
-use geometry::Au;
+use servo_util::geometry::Au;
 use platform::font_context::FontContextHandle;
 use platform::font::{FontHandle, FontTable};
 use render_context::RenderContext;

src/components/gfx/gfx.rc

@@ -41,7 +41,6 @@ mod render_context;
 // Rendering
 pub mod color;
 pub mod display_list;
-pub mod geometry;
 pub mod render_task;
 pub mod surface;
 

src/components/gfx/platform/android/font.rs

@@ -8,8 +8,8 @@ use font::{CSSFontWeight, FontHandleMethods, FontMetrics, FontTableMethods};
 use font::{FontTableTag, FractionalPixel, SpecifiedFontStyle, UsedFontStyle, FontWeight100};
 use font::{FontWeight200, FontWeight300, FontWeight400, FontWeight500, FontWeight600};
 use font::{FontWeight700, FontWeight800, FontWeight900};
-use geometry::Au;
-use geometry;
+use servo_util::geometry::Au;
+use servo_util::geometry;
 use platform::font_context::FontContextHandle;
 use text::glyph::GlyphIndex;
 use text::util::{float_to_fixed, fixed_to_float};

src/components/gfx/platform/linux/font.rs

@@ -8,8 +8,8 @@ use font::{CSSFontWeight, FontHandleMethods, FontMetrics, FontTableMethods};
 use font::{FontTableTag, FractionalPixel, SpecifiedFontStyle, UsedFontStyle, FontWeight100};
 use font::{FontWeight200, FontWeight300, FontWeight400, FontWeight500, FontWeight600};
 use font::{FontWeight700, FontWeight800, FontWeight900};
-use geometry::Au;
-use geometry;
+use servo_util::geometry::Au;
+use servo_util::geometry;
 use platform::font_context::FontContextHandle;
 use text::glyph::GlyphIndex;
 use text::util::{float_to_fixed, fixed_to_float};

src/components/gfx/platform/macos/font.rs

@@ -12,8 +12,8 @@ use font::{CSSFontWeight, FontHandleMethods, FontMetrics, FontTableMethods};
 use font::{FontTableTag, FontWeight100, FontWeight200, FontWeight300, FontWeight400};
 use font::{FontWeight500, FontWeight600, FontWeight700, FontWeight800, FontWeight900};
 use font::{FractionalPixel, SpecifiedFontStyle};
-use geometry::{Au, px_to_pt};
-use geometry;
+use servo_util::geometry::{Au, px_to_pt};
+use servo_util::geometry;
 use platform::macos::font_context::FontContextHandle;
 use text::glyph::GlyphIndex;
 

src/components/gfx/render_context.rs

@@ -3,8 +3,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 use servo_msg::compositor_msg::LayerBuffer;
+use servo_util::geometry::Au;
 use font_context::FontContext;
-use geometry::Au;
 use newcss::values::CSSBorderStyle;
 use newcss::values::{CSSBorderStyleNone, CSSBorderStyleHidden, CSSBorderStyleDotted, CSSBorderStyleDashed, CSSBorderStyleSolid, CSSBorderStyleDouble, CSSBorderStyleGroove, CSSBorderStyleRidge, CSSBorderStyleInset, CSSBorderStyleOutset};
 use opts::Opts;

src/components/gfx/text/glyph.rs

@@ -4,9 +4,8 @@
 
 use servo_util::vec::*;
 use servo_util::range::Range;
-
-use geometry::Au;
-use geometry;
+use servo_util::geometry::Au;
+use servo_util::geometry;
 
 use std::cmp::{Ord, Eq};
 use std::num::NumCast;

src/components/gfx/text/shaping/harfbuzz.rs

@@ -5,7 +5,7 @@
 extern mod harfbuzz;
 
 use font::{Font, FontHandleMethods, FontTableMethods, FontTableTag};
-use geometry::Au;
+use servo_util::geometry::Au;
 use platform::font::FontTable;
 use text::glyph::{GlyphStore, GlyphIndex, GlyphData};
 use text::shaping::ShaperMethods;

src/components/gfx/text/text_run.rs

@@ -5,7 +5,7 @@
 use std::vec::VecIterator;
 
 use font_context::FontContext;
-use geometry::Au;
+use servo_util::geometry::Au;
 use text::glyph::GlyphStore;
 use font::{Font, FontDescriptor, RunMetrics};
 use servo_util::range::Range;

src/components/main/layout/block.rs

@@ -17,8 +17,8 @@ use geom::point::Point2D;
 use geom::size::Size2D;
 use geom::rect::Rect;
 use gfx::display_list::DisplayList;
-use gfx::geometry::{Au, to_frac_px};
-use gfx::geometry;
+use servo_util::geometry::{Au, to_frac_px};
+use servo_util::geometry;
 
 pub struct BlockFlowData {
     /// Data common to all flows.

src/components/main/layout/box.rs

@@ -21,7 +21,7 @@ use gfx::display_list::{DisplayList, ImageDisplayItem, ImageDisplayItemClass};
 use gfx::display_list::{SolidColorDisplayItem, SolidColorDisplayItemClass, TextDisplayItem};
 use gfx::display_list::{TextDisplayItemClass};
 use gfx::font::{FontStyle, FontWeight300};
-use gfx::geometry::Au;
+use servo_util::geometry::Au;
 use gfx::text::text_run::TextRun;
 use newcss::color::rgb;
 use newcss::complete::CompleteStyle;

src/components/main/layout/context.rs

@@ -6,7 +6,7 @@
 
 use geom::rect::Rect;
 use gfx::font_context::FontContext;
-use gfx::geometry::Au;
+use servo_util::geometry::Au;
 use servo_net::local_image_cache::LocalImageCache;
 
 /// Data needed by the layout task.

src/components/main/layout/float.rs

@@ -13,8 +13,8 @@ use std::cell::Cell;
 use geom::point::Point2D;
 use geom::rect::Rect;
 use gfx::display_list::DisplayList;
-use gfx::geometry::Au;
-use gfx::geometry;
+use servo_util::geometry::Au;
+use servo_util::geometry;
 
 pub struct FloatFlowData {
     /// Data common to all flows.

src/components/main/layout/float_context.rs

@@ -5,7 +5,7 @@
 use geom::point::Point2D;
 use geom::size::Size2D;
 use geom::rect::Rect;
-use gfx::geometry::{Au, max, min};
+use servo_util::geometry::{Au, max, min};
 use std::util::replace;
 use std::vec;
 use std::i32::max_value;

src/components/main/layout/flow.rs

@@ -42,7 +42,7 @@ use std::io::stderr;
 use geom::point::Point2D;
 use geom::rect::Rect;
 use gfx::display_list::DisplayList;
-use gfx::geometry::Au;
+use servo_util::geometry::Au;
 use script::dom::node::{AbstractNode, LayoutView};
 
 /// The type of the formatting context and data specific to each context, such as line box

src/components/main/layout/inline.rs

@@ -17,7 +17,7 @@ use std::u16;
 use std::util;
 use geom::{Point2D, Rect, Size2D};
 use gfx::display_list::DisplayList;
-use gfx::geometry::Au;
+use servo_util::geometry::Au;
 use newcss::units::{Em, Px};
 use newcss::values::{CSSFontSizeLength};
 use newcss::values::{CSSTextAlignLeft, CSSTextAlignCenter, CSSTextAlignRight, CSSTextAlignJustify};

src/components/main/layout/layout_task.rs

@@ -23,7 +23,7 @@ use geom::rect::Rect;
 use geom::size::Size2D;
 use gfx::display_list::DisplayList;
 use gfx::font_context::FontContext;
-use gfx::geometry::Au;
+use servo_util::geometry::Au;
 use gfx::opts::Opts;
 use gfx::render_task::{RenderMsg, RenderChan, RenderLayer};
 use gfx::render_task;

src/components/main/layout/model.rs

@@ -6,7 +6,7 @@
 
 use std::num::Zero;
 use geom::side_offsets::SideOffsets2D;
-use gfx::geometry::Au;
+use servo_util::geometry::Au;
 use newcss::complete::CompleteStyle;
 use newcss::units::{Length, Em, Px};
 use newcss::values::{CSSBorderWidth, CSSBorderWidthLength, CSSBorderWidthMedium};

src/components/script/dom/htmlimageelement.rs

@@ -6,7 +6,7 @@ use dom::bindings::utils::{DOMString, ErrorResult, null_str_as_empty};
 use dom::htmlelement::HTMLElement;
 use dom::node::{ScriptView, AbstractNode};
 use extra::url::Url;
-use gfx::geometry::to_px;
+use servo_util::geometry::to_px;
 use layout_interface::{ContentBoxQuery, ContentBoxResponse};
 use servo_net::image_cache_task;
 use servo_net::image_cache_task::ImageCacheTask;

src/components/script/layout_interface.rs

@@ -12,7 +12,7 @@ use std::comm::{Chan, SharedChan};
 use geom::rect::Rect;
 use geom::size::Size2D;
 use geom::point::Point2D;
-use gfx::geometry::Au;
+use servo_util::geometry::Au;
 use newcss::stylesheet::Stylesheet;
 use extra::url::Url;
 

src/components/util/util.rc

@@ -9,8 +9,10 @@
 #[crate_type = "lib"];
 
 extern mod extra;
+extern mod geom;
 
 pub mod cache;
+pub mod geometry;
 pub mod range;
 pub mod time;
 pub mod tree;