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/box_builder.rs | |
parent | adeae3c46c494f4537a902d9b7c3f522335afc85 (diff) | |
download | servo-162f1546b0207838f5f202e45aa058fd3ce4dadc.tar.gz servo-162f1546b0207838f5f202e45aa058fd3ce4dadc.zip |
servo: Update to Rust 754704ea9442ce92602f8022f6c979824b016842
Diffstat (limited to 'src/servo/layout/box_builder.rs')
-rw-r--r-- | src/servo/layout/box_builder.rs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/servo/layout/box_builder.rs b/src/servo/layout/box_builder.rs index a91a1191d78..e7461d02a9a 100644 --- a/src/servo/layout/box_builder.rs +++ b/src/servo/layout/box_builder.rs @@ -254,13 +254,13 @@ impl LayoutTreeBuilder { fn make_flow(ty : FlowContextType) -> @FlowContext { let data = FlowData(self.next_flow_id()); let ret = match ty { - Flow_Absolute => @AbsoluteFlow(data), - Flow_Block => @BlockFlow(data, BlockFlowData()), - Flow_Float => @FloatFlow(data), - Flow_InlineBlock => @InlineBlockFlow(data), - Flow_Inline => @InlineFlow(data, InlineFlowData()), - Flow_Root => @RootFlow(data, RootFlowData()), - Flow_Table => @TableFlow(data) + Flow_Absolute => @AbsoluteFlow(move data), + Flow_Block => @BlockFlow(move data, BlockFlowData()), + Flow_Float => @FloatFlow(move data), + Flow_InlineBlock => @InlineBlockFlow(move data), + Flow_Inline => @InlineFlow(move data, InlineFlowData()), + Flow_Root => @RootFlow(move data, RootFlowData()), + Flow_Table => @TableFlow(move data) }; debug!("LayoutTreeBuilder: created flow: %s", ret.debug_str()); ret @@ -295,7 +295,7 @@ impl LayoutTreeBuilder { let holder = ImageHolder({copy *d.image.get_ref()}, layout_ctx.image_cache); - @ImageBox(RenderBoxData(node, ctx, self.next_box_id()), holder) + @ImageBox(RenderBoxData(node, ctx, self.next_box_id()), move holder) } else { info!("Tried to make image box, but couldn't find image. Made generic box instead."); self.make_generic_box(layout_ctx, node, ctx) |