diff options
author | Patrick Walton <pcwalton@mimiga.net> | 2012-10-18 17:03:08 -0700 |
---|---|---|
committer | Patrick Walton <pcwalton@mimiga.net> | 2012-10-18 17:41:59 -0700 |
commit | 162f1546b0207838f5f202e45aa058fd3ce4dadc (patch) | |
tree | 76fc28ae048773c8b13345b682a78287d73c86d3 /src/servo/layout/layout_task.rs | |
parent | adeae3c46c494f4537a902d9b7c3f522335afc85 (diff) | |
download | servo-162f1546b0207838f5f202e45aa058fd3ce4dadc.tar.gz servo-162f1546b0207838f5f202e45aa058fd3ce4dadc.zip |
servo: Update to Rust 754704ea9442ce92602f8022f6c979824b016842
Diffstat (limited to 'src/servo/layout/layout_task.rs')
-rw-r--r-- | src/servo/layout/layout_task.rs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/servo/layout/layout_task.rs b/src/servo/layout/layout_task.rs index 78c0e82f8c9..177b0530545 100644 --- a/src/servo/layout/layout_task.rs +++ b/src/servo/layout/layout_task.rs @@ -4,7 +4,7 @@ */ use au = gfx::geometry; -use au::au; +use au::Au; use content::content_task; use core::dvec::DVec; use css::resolve::apply::apply_style; @@ -63,7 +63,7 @@ struct BuildData { fn LayoutTask(render_task: RenderTask, img_cache_task: ImageCacheTask) -> LayoutTask { - do spawn_listener::<Msg> |from_content| { + do spawn_listener::<Msg> |from_content, move img_cache_task| { Layout(render_task, img_cache_task.clone(), from_content).start(); } } @@ -105,7 +105,7 @@ impl Layout { match self.from_content.recv() { BuildMsg(move data) => { - let data = Cell(data); + let data = Cell(move data); do time("layout: performing layout") { self.handle_build(data.take()); @@ -147,8 +147,8 @@ impl Layout { let layout_ctx = LayoutContext { image_cache: self.local_image_cache, font_cache: self.font_cache, - doc_url: doc_url, - screen_size: Rect(Point2D(au(0), au(0)), screen_size) + doc_url: move doc_url, + screen_size: Rect(Point2D(Au(0), Au(0)), screen_size) }; let layout_root: @FlowContext = do time("layout: tree construction") { @@ -210,7 +210,7 @@ impl Layout { let response = match node.aux(|a| copy *a).flow { None => Err(()), Some(flow) => { - let start_val : Option<Rect<au>> = None; + let start_val : Option<Rect<Au>> = None; let rect = do flow.foldl_boxes_for_node(node, start_val) |acc, box| { match acc { Some(acc) => Some(acc.union(&box.content_box())), @@ -249,7 +249,7 @@ impl Layout { let f: ~fn(ImageResponseMsg) = |_msg, move dom_event_chan| { dom_event_chan.send(ReflowEvent) }; - f + move f }; return f; } |