From 670c1deb2e382c75b44713c15c70499be624fcd7 Mon Sep 17 00:00:00 2001
From: Josh Matthews <josh@joshmatthews.net>
Date: Thu, 14 Feb 2013 06:58:16 -0500
Subject: [PATCH] Rebase.

---
 src/servo-gfx/font.rs                   |  9 ++++++++-
 src/servo-gfx/font_list.rs              |  1 +
 src/servo-gfx/resource/resource_task.rs | 18 +++++++++---------
 src/servo-gfx/text/harfbuzz/shaper.rs   |  1 +
 src/servo-gfx/text/text_run.rs          |  2 +-
 src/servo/html/hubbub_html_parser.rs    |  1 +
 src/servo/layout/layout_task.rs         |  1 -
 7 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/src/servo-gfx/font.rs b/src/servo-gfx/font.rs
index b33140a2e16..e1c50c8dcf4 100644
--- a/src/servo-gfx/font.rs
+++ b/src/servo-gfx/font.rs
@@ -6,6 +6,7 @@ use util::range::Range;
 use text::glyph::{GlyphStore, GlyphIndex};
 use text::shaper::ShaperMethods;
 use text::{Shaper, TextRun};
+use text::shaper::ShaperMethods;
 
 use azure::{AzFloat, AzScaledFontRef, struct__AzDrawOptions, struct__AzGlyph};
 use azure::{struct__AzGlyphBuffer, struct__AzPoint};
@@ -356,7 +357,13 @@ pub impl Font {
                               baseline_origin: Point2D<Au>,
                               color: Color) {
         use core::libc::types::common::c99::{uint16_t, uint32_t};
-        use azure::{AzDrawOptions, AzGlyph, AzGlyphBuffer};
+        use azure::{AzDrawOptions,
+                    struct__AzDrawOptions,
+                    AzGlyph,
+                    struct__AzGlyph,
+                    AzGlyphBuffer,
+                    struct__AzGlyphBuffer,
+                    struct__AzPoint};
         use azure::azure::bindgen::{AzCreateColorPattern};
         use azure::azure::bindgen::{AzDrawTargetFillGlyphs};
         use azure::azure::bindgen::{AzReleaseColorPattern};
diff --git a/src/servo-gfx/font_list.rs b/src/servo-gfx/font_list.rs
index b1a5371d7bc..7db073c94b2 100644
--- a/src/servo-gfx/font_list.rs
+++ b/src/servo-gfx/font_list.rs
@@ -1,6 +1,7 @@
 use font::{CSSFontWeight, SpecifiedFontStyle, UsedFontStyle};
 use gfx_font::FontHandleMethods;
 use native::FontHandle;
+use gfx_font::FontHandleMethods;
 
 use core::hashmap::linear;
 
diff --git a/src/servo-gfx/resource/resource_task.rs b/src/servo-gfx/resource/resource_task.rs
index 7786ae8cabd..24da1999baf 100644
--- a/src/servo-gfx/resource/resource_task.rs
+++ b/src/servo-gfx/resource/resource_task.rs
@@ -51,12 +51,12 @@ pub fn ResourceTask() -> ResourceTask {
 }
 
 fn create_resource_task_with_loaders(loaders: ~[(~str, LoaderTaskFactory)]) -> ResourceTask {
-	let loaders_cell = Cell(loaders);
+    let loaders_cell = Cell(loaders);
     let chan = do spawn_listener |from_client| {
         // TODO: change copy to move once we can move out of closures
         ResourceManager(from_client, loaders_cell.take()).start()
     };
-	SharedChan(chan)
+    SharedChan(chan)
 }
 
 pub struct ResourceManager {
@@ -105,13 +105,13 @@ impl ResourceManager {
 
     fn get_loader_factory(&self, url: &Url) -> Option<LoaderTask> {
         for self.loaders.each |scheme_loader| {
-			match *scheme_loader {
-				(ref scheme, ref loader_factory) => {
-					if (*scheme) == url.scheme {
-						return Some((*loader_factory)());
-					}
-				}
-			}
+            match *scheme_loader {
+                (ref scheme, ref loader_factory) => {
+	            if (*scheme) == url.scheme {
+                        return Some((*loader_factory)());
+                    }
+	        }
+            }
         }
         return None;
     }
diff --git a/src/servo-gfx/text/harfbuzz/shaper.rs b/src/servo-gfx/text/harfbuzz/shaper.rs
index 599cb98ff57..23bf2e2f3ee 100644
--- a/src/servo-gfx/text/harfbuzz/shaper.rs
+++ b/src/servo-gfx/text/harfbuzz/shaper.rs
@@ -8,6 +8,7 @@ use font::{Font, FontTable, FontTableMethods, FontTableTag};
 
 use text::glyph::{GlyphStore, GlyphIndex, GlyphData};
 use text::shaper::ShaperMethods;
+use gfx_font::{FontHandleMethods, FontTableMethods};
 
 use servo_util::range;
 use util::range::Range;
diff --git a/src/servo-gfx/text/text_run.rs b/src/servo-gfx/text/text_run.rs
index 2f8993285d9..56987a722e1 100644
--- a/src/servo-gfx/text/text_run.rs
+++ b/src/servo-gfx/text/text_run.rs
@@ -1,7 +1,7 @@
 use font_context::FontContext;
 use geometry::Au;
 use text::glyph::{BreakTypeNormal, GlyphStore};
-use servo_gfx_font::{Font, FontDescriptor, RunMetrics};
+use servo_gfx_font::{Font, FontDescriptor, RunMetrics, FontHandleMethods};
 use servo_gfx_util::range::Range;
 
 use core::libc::{c_void};
diff --git a/src/servo/html/hubbub_html_parser.rs b/src/servo/html/hubbub_html_parser.rs
index 6259839a455..2268de6c7ed 100644
--- a/src/servo/html/hubbub_html_parser.rs
+++ b/src/servo/html/hubbub_html_parser.rs
@@ -221,6 +221,7 @@ pub fn parse_html(url: Url,
     };
     let css_chan = SharedChan(css_chan);
 
+    let resource_task2 = resource_task.clone();
     // Spawn a JS parser to receive JavaScript.
     let resource_task2 = resource_task.clone();
     let (js_port, js_chan): (Port<JSResult>, Chan<JSMessage>) =
diff --git a/src/servo/layout/layout_task.rs b/src/servo/layout/layout_task.rs
index 462de1a9894..9534e3bbca4 100644
--- a/src/servo/layout/layout_task.rs
+++ b/src/servo/layout/layout_task.rs
@@ -99,7 +99,6 @@ struct Layout {
     image_cache_task: ImageCacheTask,
     local_image_cache: @mut LocalImageCache,
     from_content: Port<Msg>,
-
     font_ctx: @mut FontContext,
     // This is used to root reader data
     layout_refs: ~[@mut LayoutData],