servo: Merge #10941 - Remove dead code left over from #10085 (from samlh:patch-2); r=mbrubeck

cc @pcwalton

Source-Repo: https://github.com/servo/servo
Source-Revision: b5a23a16be861a837f7079244ca901fd0d0bef04
This commit is contained in:
Samuel Harrington 2016-04-30 09:44:25 -07:00
Родитель 1385b9e2ec
Коммит 3ee95bc97b
2 изменённых файлов: 0 добавлений и 13 удалений

Просмотреть файл

@ -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.

Просмотреть файл

@ -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.
///
/// 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();
}
#[inline]
pub fn union_floated_descendants_flags(&mut self, other: FlowFlags) {
self.insert(other & HAS_FLOATED_DESCENDANTS_BITMASK);
}
#[inline]
pub fn float_kind(&self) -> float::T {
if self.contains(FLOATS_LEFT) {