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 #933 : saneyuki/servo/is_some, r=jdm

Browse source 
Fix #919
This commit is contained in:
bors-servo 2013-09-13 09:06:53 -07:00
commit 4f58545fd6
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -420,13 +420,13 @@ impl LayoutTreeBuilder {
let new_generator = match (display, &mut parent_generator.flow, sibling_flow) {
// Floats
(CSSDisplayBlock, & &BlockFlow(_), _) |
(CSSDisplayBlock, & &FloatFlow(_), _) if !is_float.is_none() => {
(CSSDisplayBlock, & &FloatFlow(_), _) if is_float.is_some() => {
self.create_child_generator(node, parent_generator, Flow_Float(is_float.unwrap()))
}
// If we're placing a float after an inline, append the float to the inline flow,
// then continue building from the inline flow in case there are more inlines
// afterward.
(CSSDisplayBlock, _, Some(&InlineFlow(_))) if !is_float.is_none() => {
(CSSDisplayBlock, _, Some(&InlineFlow(_))) if is_float.is_some() => {
let float_generator = self.create_child_generator(node,
sibling_generator.unwrap(),
Flow_Float(is_float.unwrap()));
@ -435,7 +435,7 @@ impl LayoutTreeBuilder {
// This is a catch-all case for when:
// a) sibling_flow is None
// b) sibling_flow is a BlockFlow
(CSSDisplayBlock, & &InlineFlow(_), _) if !is_float.is_none() => {
(CSSDisplayBlock, & &InlineFlow(_), _) if is_float.is_some() => {
self.create_child_generator(node, parent_generator, Flow_Float(is_float.unwrap()))
}