Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 21:50:18 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #5480 - SimonSapin:multicol, r=pcwalton

Browse source 
This add some properties to the style system and a new flow type, but the larger issues of dealing with fragmentation in the flow tree is still an open question.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/5480)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-04-28 19:48:45 -05:00
commit 1e150140bd
15 changed files with 388 additions and 125 deletions
Download patch file Download diff file Expand all files Collapse all files

8
components/layout/floats.rs
View file

@ -19,11 +19,11 @@ pub enum FloatKind {
}
impl FloatKind {
pub fn from_property(property: float::T) -> FloatKind {
pub fn from_property(property: float::T) -> Option<FloatKind> {
match property {
float::T::none => panic!("can't create a float type from an unfloated property"),
float::T::left => FloatKind::Left,
float::T::right => FloatKind::Right,
float::T::none => None,
float::T::left => Some(FloatKind::Left),
float::T::right => Some(FloatKind::Right),
}
}
}