Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-14 10:53:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix nits; warning police

Browse source
This commit is contained in:
Eric Atkinson 2013-08-20 11:47:50 -07:00
parent 9b08fd8d18
commit 5e3ff91a2d
5 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/components/main/layout/aux.rs
View file

@ -37,7 +37,7 @@ impl LayoutData {
LayoutData { LayoutData {
style: None, style: None,
restyle_damage: None, restyle_damage: None,
boxes: DisplayBoxes{ display_list: None, range: None }, boxes: DisplayBoxes { display_list: None, range: None },
} }
} }
} }

1
src/components/main/layout/box.rs
View file

@ -8,7 +8,6 @@ use css::node_style::StyledNode;
use layout::context::LayoutContext; use layout::context::LayoutContext;
use layout::display_list_builder::{DisplayListBuilder, ExtraDisplayListData, ToGfxColor}; use layout::display_list_builder::{DisplayListBuilder, ExtraDisplayListData, ToGfxColor};
use layout::float_context::{ClearType, ClearLeft, ClearRight, ClearBoth}; use layout::float_context::{ClearType, ClearLeft, ClearRight, ClearBoth};
use layout::flow::FlowContext;
use layout::model::{BoxModel, MaybeAuto}; use layout::model::{BoxModel, MaybeAuto};
use layout::text; use layout::text;

5
src/components/main/layout/box_builder.rs
View file

@ -30,7 +30,6 @@ use script::dom::node::{AbstractNode, CommentNodeTypeId, DoctypeNodeTypeId};
use script::dom::node::{ElementNodeTypeId, LayoutView, TextNodeTypeId}; use script::dom::node::{ElementNodeTypeId, LayoutView, TextNodeTypeId};
use servo_util::range::Range; use servo_util::range::Range;
use servo_util::tree::{TreeNodeRef, TreeNode}; use servo_util::tree::{TreeNodeRef, TreeNode};
use std::util;
use std::cell::Cell; use std::cell::Cell;
pub struct LayoutTreeBuilder { pub struct LayoutTreeBuilder {
@ -481,7 +480,7 @@ impl LayoutTreeBuilder {
ty: FlowContextType) ty: FlowContextType)
-> BoxGenerator<'a> { -> BoxGenerator<'a> {
let mut new_flow = self.make_flow(ty, node); let new_flow = self.make_flow(ty, node);
parent_generator.flow.add_new_child(new_flow); parent_generator.flow.add_new_child(new_flow);
BoxGenerator::new(parent_generator.flow.last_child().unwrap()) BoxGenerator::new(parent_generator.flow.last_child().unwrap())
} }
@ -590,7 +589,7 @@ impl LayoutTreeBuilder {
let mut new_flow = self.make_flow(Flow_Root, root); let mut new_flow = self.make_flow(Flow_Root, root);
{ {
let mut new_generator = BoxGenerator::new(&mut new_flow); let new_generator = BoxGenerator::new(&mut new_flow);
self.construct_recursively(layout_ctx, root, new_generator, None); self.construct_recursively(layout_ctx, root, new_generator, None);
} }
return Ok(new_flow) return Ok(new_flow)

2
src/components/main/layout/float.rs
View file

@ -5,7 +5,7 @@
use layout::box::{RenderBox}; use layout::box::{RenderBox};
use layout::context::LayoutContext; use layout::context::LayoutContext;
use layout::display_list_builder::{DisplayListBuilder, ExtraDisplayListData}; use layout::display_list_builder::{DisplayListBuilder, ExtraDisplayListData};
use layout::flow::{FloatFlow, FlowData}; use layout::flow::{FlowData};
use layout::model::{MaybeAuto}; use layout::model::{MaybeAuto};
use layout::float_context::{FloatContext, PlacementInfo, FloatType}; use layout::float_context::{FloatContext, PlacementInfo, FloatType};

1
src/components/main/layout/layout_task.rs
View file

@ -16,7 +16,6 @@ use layout::incremental::{RestyleDamage, BubbleWidths};
use std::cast::transmute; use std::cast::transmute;
use std::cell::Cell; use std::cell::Cell;
use std::uint;
use std::comm::{Port}; use std::comm::{Port};
use extra::arc::Arc; use extra::arc::Arc;
use geom::point::Point2D; use geom::point::Point2D;