Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

style: Properly compare the value of the alignment flags.

Browse source 
What this did before happens to be ok for these constants, but it's not great,
because it depends on their particular value.
This commit is contained in:
Emilio Cobos Álvarez 2018-01-29 10:41:59 +01:00
parent 8d7a3f4f3d
commit b7238c43cd
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
1 changed files with 23 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

46
components/style/values/specified/align.rs
View file

@ -69,6 +69,14 @@ bitflags! {
}
}
impl AlignFlags {
/// Returns the enumeration value stored in the lower 5 bits.
#[inline]
fn value(&self) -> Self {
*self & !AlignFlags::FLAG_BITS
}
}
impl ToCss for AlignFlags {
fn to_css<W>(&self, dest: &mut CssWriter<W>) -> fmt::Result
where
@ -81,7 +89,7 @@ impl ToCss for AlignFlags {
_ => {}
}
dest.write_str(match *self & !AlignFlags::FLAG_BITS {
dest.write_str(match self.value() {
AlignFlags::AUTO => "auto",
AlignFlags::NORMAL => "normal",
AlignFlags::START => "start",
@ -150,21 +158,17 @@ impl ContentDistribution {
/// Returns whether this value is valid for both axis directions.
pub fn is_valid_on_both_axes(&self) -> bool {
if self.primary.contains(AlignFlags::BASELINE) ||
self.primary.contains(AlignFlags::LAST_BASELINE)
{
match self.primary.value() {
// <baseline-position> is only allowed on the block axis.
return false;
}
AlignFlags::BASELINE |
AlignFlags::LAST_BASELINE => false,
if self.primary.contains(AlignFlags::LEFT) ||
self.primary.contains(AlignFlags::RIGHT)
{
// left | right are only allowed on the inline axis.
return false;
}
AlignFlags::LEFT |
AlignFlags::RIGHT => false,
true
_ => true,
}
}
/// The primary alignment
@ -297,21 +301,17 @@ impl SelfAlignment {
/// Returns whether this value is valid for both axis directions.
pub fn is_valid_on_both_axes(&self) -> bool {
if self.0.contains(AlignFlags::BASELINE) ||
self.0.contains(AlignFlags::LAST_BASELINE)
{
match self.0.value() {
// <baseline-position> is only allowed on the block axis.
return false;
}
AlignFlags::BASELINE |
AlignFlags::LAST_BASELINE => false,
if self.0.contains(AlignFlags::LEFT) ||
self.0.contains(AlignFlags::RIGHT)
{
// left | right are only allowed on the inline axis.
return false;
}
AlignFlags::LEFT |
AlignFlags::RIGHT => false,
true
_ => true,
}
}
/// Whether this value has extra flags.