From 57ae56777736cebcea468582d2ff8efd0c6f5540 Mon Sep 17 00:00:00 2001
From: Patrick Walton <pcwalton@mimiga.net>
Date: Tue, 27 Mar 2012 16:58:27 -0700
Subject: [PATCH] rustc: Move geom to gfx and stub gfx/surface and
 image/encode/tga

Conflicts:

	src/gfx/surface.rs
	src/layout/base.rs
---
 src/{util => gfx}/geom.rs | 0
 src/gfx/surface.rs        | 2 +-
 src/layout/base.rs        | 8 +++++---
 src/servo.rc              | 4 ++--
 4 files changed, 8 insertions(+), 6 deletions(-)
 rename src/{util => gfx}/geom.rs (100%)

diff --git a/src/util/geom.rs b/src/gfx/geom.rs
similarity index 100%
rename from src/util/geom.rs
rename to src/gfx/geom.rs
diff --git a/src/gfx/surface.rs b/src/gfx/surface.rs
index 2b91c26bb2e..ac64b2a0961 100644
--- a/src/gfx/surface.rs
+++ b/src/gfx/surface.rs
@@ -1,6 +1,6 @@
 enum format {
     fo_rgba_8888
-    // TODO: RGB 565
+    // TODO: RGB 565, others?
 }
 
 type surface = {
diff --git a/src/layout/base.rs b/src/layout/base.rs
index bfa597c52ec..34507cc3338 100644
--- a/src/layout/base.rs
+++ b/src/layout/base.rs
@@ -1,7 +1,8 @@
 import dom::rcu;
 import dom::rcu::methods;
-import util::{tree, geom};
-import geom::{size, rect, point, au};
+import gfx::geom;
+import gfx::geom::{size, rect, point, au};
+import util::{tree};
 
 enum box = @{
     tree: tree::fields<box>,
@@ -136,4 +137,5 @@ mod test {
                       geom::box(au(0), au(25), au(10), au(20)),  // n2
                       geom::box(au(0), au(0), au(100), au(45))]; // n3
     }
-}
\ No newline at end of file
+}
+
diff --git a/src/servo.rc b/src/servo.rc
index ff2b9e8cddd..f4d0fc6ff63 100755
--- a/src/servo.rc
+++ b/src/servo.rc
@@ -14,6 +14,7 @@ mod dom {
 }
 
 mod gfx {
+    mod geom;
     mod surface;
 }
 
@@ -33,5 +34,4 @@ mod widget {
 
 mod util {
     mod tree;
-    mod geom;
-}
\ No newline at end of file
+}