Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 06:00:15 +01:00
Code Issues Projects Releases Packages Wiki Activity

auto merge of #4309 : mbrubeck/servo/float-cleanup, r=pcwalton

Browse source 
r? @SimonSapin or @pcwalton
This commit is contained in:
bors-servo 2014-12-09 17:01:12 -07:00
commit d8a5199ba8
2 changed files with 11 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

8
components/layout/block.rs
View file

@ -908,12 +908,8 @@ impl BlockFlow {
}
// Lay the child out if this was an in-order traversal.
let need_to_process_child_floats = if flow::base(kid).flags.is_float() {
kid.place_float_if_applicable(layout_context);
true
} else {
kid.assign_block_size_for_inorder_child_if_necessary(layout_context)
};
let need_to_process_child_floats =
kid.assign_block_size_for_inorder_child_if_necessary(layout_context);
// Mark flows for layerization if necessary to handle painting order correctly.
propagate_layer_flag_from_child(&mut layers_needed_for_descendants, kid);

18
components/layout/inline.rs
View file

@ -169,16 +169,16 @@ enum WrapMode {
}
struct LineBreaker {
pub floats: Floats,
pub new_fragments: Vec<Fragment>,
pub work_list: RingBuf<Fragment>,
pub pending_line: Line,
pub lines: Vec<Line>,
pub cur_b: Au, // Current position on the block direction
floats: Floats,
new_fragments: Vec<Fragment>,
work_list: RingBuf<Fragment>,
pending_line: Line,
lines: Vec<Line>,
cur_b: Au, // Current position on the block direction
}
impl LineBreaker {
pub fn new(float_context: Floats) -> LineBreaker {
fn new(float_context: Floats) -> LineBreaker {
LineBreaker {
new_fragments: Vec::new(),
work_list: RingBuf::new(),
@ -193,7 +193,7 @@ impl LineBreaker {
}
}
pub fn floats(&mut self) -> Floats {
fn floats(&mut self) -> Floats {
self.floats.clone()
}
@ -215,7 +215,7 @@ impl LineBreaker {
self.pending_line.green_zone = LogicalSize::zero(self.floats.writing_mode)
}
pub fn scan_for_lines(&mut self, flow: &mut InlineFlow, layout_context: &LayoutContext) {
fn scan_for_lines(&mut self, flow: &mut InlineFlow, layout_context: &LayoutContext) {
self.reset_scanner();
let mut old_fragments = mem::replace(&mut flow.fragments, InlineFragments::new());