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

style: Remove the display: -moz-box overrides display: -webkit-box hack.

Browse source 
display: -moz-box is no longer exposed to content so this is not necessary.

See bug 1407701 for context.

Differential Revision: https://phabricator.services.mozilla.com/D12961
This commit is contained in:
Emilio Cobos Álvarez 2018-11-26 18:56:14 +00:00
parent 2e388e860d
commit 8bed8ae122
2 changed files with 0 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

16
components/style/properties/declaration_block.rs
View file

@ -462,22 +462,6 @@ impl PropertyDeclarationBlock {
return false; return false;
} }
// As a compatibility hack, specially on Android,
// don't allow to override a prefixed webkit display
// value with an unprefixed version from parsing
// code.
//
// TODO(emilio): Unship.
if let PropertyDeclaration::Display(old_display) = *slot {
use crate::properties::longhands::display::computed_value::T as display;
if let PropertyDeclaration::Display(new_display) = declaration {
if display::should_ignore_parsed_value(old_display, new_display) {
return false;
}
}
}
index_to_remove = Some(i); index_to_remove = Some(i);
break; break;
} }

24
components/style/values/specified/box.rs
View file

@ -178,30 +178,6 @@ impl Display {
} }
} }
/// Whether `new_display` should be ignored, given a previous
/// `old_display` value.
///
/// This is used to ignore `display: -moz-box` declarations after an
/// equivalent `display: -webkit-box` declaration, since the former
/// has a vastly different meaning. See bug 1107378 and bug 1407701.
///
/// FIXME(emilio): This is a pretty decent hack, we should try to
/// remove it.
pub fn should_ignore_parsed_value(_old_display: Self, _new_display: Self) -> bool {
#[cfg(feature = "gecko")]
{
match (_old_display, _new_display) {
(Display::WebkitBox, Display::MozBox) |
(Display::WebkitInlineBox, Display::MozInlineBox) => {
return true;
},
_ => {},
}
}
return false;
}
/// Returns whether this "display" value is one of the types for /// Returns whether this "display" value is one of the types for
/// ruby. /// ruby.
#[cfg(feature = "gecko")] #[cfg(feature = "gecko")]