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

Auto merge of #24420 - servo:inline-block-lies, r=SimonSapin

Browse source 
Handle inline-block as block for now in layout 2020

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/24420)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2019-10-11 16:15:18 -04:00 • committed by GitHub
commit 641f5e66e6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
components/layout_2020/flow/construct.rs
View file

@ -331,7 +331,9 @@ where
contents: replaced, contents: replaced,
}), }),
Ok(non_replaced) => match display_inside { Ok(non_replaced) => match display_inside {
DisplayInside::Flow => { DisplayInside::Flow |
// TODO: Properly implement display: inline-block.
DisplayInside::FlowRoot => {
// Whatever happened before, we just found an inline level element, so // Whatever happened before, we just found an inline level element, so
// all we need to do is to remember this ongoing inline level box. // all we need to do is to remember this ongoing inline level box.
self.ongoing_inline_boxes_stack.push(InlineBox { self.ongoing_inline_boxes_stack.push(InlineBox {
@ -350,10 +352,6 @@ where
inline_box.last_fragment = true; inline_box.last_fragment = true;
Arc::new(InlineLevelBox::InlineBox(inline_box)) Arc::new(InlineLevelBox::InlineBox(inline_box))
}, },
DisplayInside::FlowRoot => {
// a.k.a. `inline-block`
unimplemented!()
},
DisplayInside::None | DisplayInside::Contents => panic!(":("), DisplayInside::None | DisplayInside::Contents => panic!(":("),
}, },
}; };