auto merge of #3604 : pcwalton/servo/inline-block-overflow-hidden, r=glennw

Makes lots of GitHub appear.

r? @glennw
This commit is contained in:
bors-servo 2014-10-13 15:54:41 -06:00
commit a92e55597e
6 changed files with 34 additions and 14 deletions

View file

@ -1097,7 +1097,8 @@ impl BlockFlow {
DList::new()));
}
accumulator.finish(&mut *self, display_list);
accumulator.finish(&mut display_list);
self.base.display_list = display_list;
self.base.layers = child_layers
}