Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-25 09:34:32 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #10941 - samlh:patch-2, r=mbrubeck

Browse source 
Remove dead code left over from #10085

cc @pcwalton

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10941)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-04-30 09:44:25 -07:00
commit b5a23a16be
2 changed files with 0 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/layout/block.rs
View file

@ -1518,8 +1518,6 @@ impl BlockFlow {
} }
} }
} }
flags.union_floated_descendants_flags(child_base.flags);
} }
// FIXME(pcwalton): This should consider all float descendants, not just children. // FIXME(pcwalton): This should consider all float descendants, not just children.

11
components/layout/flow.rs
View file

@ -676,12 +676,6 @@ bitflags! {
} }
} }
// NB: If you update this field, you must update the the floated descendants flags.
/// The bitmask of flags that represent the `has_left_floated_descendants` and
/// `has_right_floated_descendants` fields.
static HAS_FLOATED_DESCENDANTS_BITMASK: FlowFlags = FlowFlags { bits: 0b0000_0011 };
/// The number of bits we must shift off to handle the text alignment field. /// The number of bits we must shift off to handle the text alignment field.
/// ///
/// NB: If you update this, update `TEXT_ALIGN` above. /// NB: If you update this, update `TEXT_ALIGN` above.
@ -699,11 +693,6 @@ impl FlowFlags {
FlowFlags::from_bits(value.to_u32() << TEXT_ALIGN_SHIFT).unwrap(); FlowFlags::from_bits(value.to_u32() << TEXT_ALIGN_SHIFT).unwrap();
} }
#[inline]
pub fn union_floated_descendants_flags(&mut self, other: FlowFlags) {
self.insert(other & HAS_FLOATED_DESCENDANTS_BITMASK);
}
#[inline] #[inline]
pub fn float_kind(&self) -> float::T { pub fn float_kind(&self) -> float::T {
if self.contains(FLOATS_LEFT) { if self.contains(FLOATS_LEFT) {