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 #1832 : ibnc/servo/fixed_display_lists_fixed, r=larsbergstrom

Browse source 
fixes #1831
This commit is contained in:
bors-servo 2014-03-05 19:01:28 -05:00
commit 07b8c9bf88
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/components/main/layout/block.rs
View file

@ -1437,10 +1437,9 @@ impl BlockFlow {
self.build_display_list_float(builder, container_block_size, dirty, index, lists); self.build_display_list_float(builder, container_block_size, dirty, index, lists);
return index; return index;
} else if self.is_absolutely_positioned() { } else if self.is_absolutely_positioned() {
self.build_display_list_abs(builder, container_block_size, return self.build_display_list_abs(builder, container_block_size,
absolute_cb_abs_position, absolute_cb_abs_position,
dirty, index, lists); dirty, index, lists);
return index;
} }
// FIXME: Shouldn't this be the abs_rect _after_ relative positioning? // FIXME: Shouldn't this be the abs_rect _after_ relative positioning?
@ -1607,7 +1606,7 @@ impl BlockFlow {
dirty: &Rect<Au>, dirty: &Rect<Au>,
mut index: uint, mut index: uint,
lists: &RefCell<DisplayListCollection<E>>) lists: &RefCell<DisplayListCollection<E>>)
-> bool { -> uint {
let flow_origin = if self.is_fixed() { let flow_origin = if self.is_fixed() {
// The viewport is initially at (0, 0). // The viewport is initially at (0, 0).
self.base.position.origin self.base.position.origin
@ -1629,7 +1628,7 @@ impl BlockFlow {
self.base.abs_position = flow_origin; self.base.abs_position = flow_origin;
let abs_rect = Rect(flow_origin, self.base.position.size); let abs_rect = Rect(flow_origin, self.base.position.size);
if !abs_rect.intersects(dirty) { if !abs_rect.intersects(dirty) {
return true; return index;
} }
for box_ in self.box_.iter() { for box_ in self.box_.iter() {
@ -1642,7 +1641,7 @@ impl BlockFlow {
child_base.abs_position = flow_origin + child_base.position.origin; child_base.abs_position = flow_origin + child_base.position.origin;
} }
false index
} }
/// Return the top outer edge of the Hypothetical Box for an absolute flow. /// Return the top outer edge of the Hypothetical Box for an absolute flow.