Skip to content

Commit

Permalink
Children of fixed flows make into parent DL
Browse files Browse the repository at this point in the history
  fixes #1831
  • Loading branch information
Isabelle Carter committed Mar 5, 2014
1 parent f7821e4 commit 25a3918
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions src/components/main/layout/block.rs
Expand Up @@ -1244,10 +1244,9 @@ impl BlockFlow {
self.build_display_list_float(builder, container_block_size, dirty, index, lists);
return index;
} 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,
dirty, index, lists);
return index;
}

// FIXME: Shouldn't this be the abs_rect _after_ relative positioning?
Expand Down Expand Up @@ -1395,7 +1394,7 @@ impl BlockFlow {
dirty: &Rect<Au>,
mut index: uint,
lists: &RefCell<DisplayListCollection<E>>)
-> bool {
-> uint {
let flow_origin = if self.is_fixed() {
// The viewport is initially at (0, 0).
self.base.position.origin
Expand All @@ -1417,7 +1416,7 @@ impl BlockFlow {
self.base.abs_position = flow_origin;
let abs_rect = Rect(flow_origin, self.base.position.size);
if !abs_rect.intersects(dirty) {
return true;
return index;
}

for box_ in self.box_.iter() {
Expand All @@ -1430,7 +1429,7 @@ impl BlockFlow {
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.
Expand Down

5 comments on commit 25a3918

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from larsbergstrom
at ibnc@25a3918

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging ibnc/servo/fixed_display_lists_fixed = 25a3918 into auto

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ibnc/servo/fixed_display_lists_fixed = 25a3918 merged ok, testing candidate = 07b8c9b

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = 07b8c9b

Please sign in to comment.