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

style: Hide -moz- display values from content behind a pref.

Browse source 
Bug: 1288572
Reviewed-by: xidorn
MozReview-Commit-ID: HDQPub043H1
This commit is contained in:
Emilio Cobos Álvarez 2018-06-02 19:35:12 +02:00
parent 1da798e65b
commit cf7b10a32d
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
2 changed files with 22 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
components/style/properties/longhand/box.mako.rs
View file

@ -9,8 +9,6 @@
inherited=False, inherited=False,
gecko_name="Display") %> gecko_name="Display") %>
// TODO(SimonSapin): don't parse `inline-table`, since we don't support it
//
// We allow "display" to apply to placeholders because we need to make the // We allow "display" to apply to placeholders because we need to make the
// placeholder pseudo-element an inline-block in the UA stylesheet in Gecko. // placeholder pseudo-element an inline-block in the UA stylesheet in Gecko.
${helpers.predefined_type( ${helpers.predefined_type(
@ -19,7 +17,6 @@ ${helpers.predefined_type(
"computed::Display::inline()", "computed::Display::inline()",
initial_specified_value="specified::Display::inline()", initial_specified_value="specified::Display::inline()",
animation_value_type="discrete", animation_value_type="discrete",
needs_context=False,
flags="APPLIES_TO_PLACEHOLDER", flags="APPLIES_TO_PLACEHOLDER",
spec="https://drafts.csswg.org/css-display/#propdef-display", spec="https://drafts.csswg.org/css-display/#propdef-display",
servo_restyle_damage="rebuild_and_reflow" servo_restyle_damage="rebuild_and_reflow"

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

@ -19,6 +19,17 @@ use values::generics::box_::VerticalAlign as GenericVerticalAlign;
use values::specified::{AllowQuirks, Number}; use values::specified::{AllowQuirks, Number};
use values::specified::length::{LengthOrPercentage, NonNegativeLength}; use values::specified::length::{LengthOrPercentage, NonNegativeLength};
#[cfg(feature = "gecko")]
fn moz_display_values_enabled(context: &ParserContext) -> bool {
use gecko_bindings::structs;
use stylesheets::Origin;
context.stylesheet_origin == Origin::UserAgent ||
context.chrome_rules_enabled() ||
unsafe {
structs::StaticPrefs_sVarCache_layout_css_xul_display_values_content_enabled
}
}
#[allow(missing_docs)] #[allow(missing_docs)]
#[derive(Clone, Copy, Debug, Eq, Hash, MallocSizeOf, Parse, PartialEq, #[derive(Clone, Copy, Debug, Eq, Hash, MallocSizeOf, Parse, PartialEq,
SpecifiedValueInfo, ToComputedValue, ToCss)] SpecifiedValueInfo, ToComputedValue, ToCss)]
@ -69,26 +80,37 @@ pub enum Display {
#[cfg(feature = "gecko")] #[cfg(feature = "gecko")]
WebkitInlineBox, WebkitInlineBox,
#[cfg(feature = "gecko")] #[cfg(feature = "gecko")]
#[css(parse_condition = "moz_display_values_enabled")]
MozBox, MozBox,
#[cfg(feature = "gecko")] #[cfg(feature = "gecko")]
#[css(parse_condition = "moz_display_values_enabled")]
MozInlineBox, MozInlineBox,
#[cfg(feature = "gecko")] #[cfg(feature = "gecko")]
#[css(parse_condition = "moz_display_values_enabled")]
MozGrid, MozGrid,
#[cfg(feature = "gecko")] #[cfg(feature = "gecko")]
#[css(parse_condition = "moz_display_values_enabled")]
MozInlineGrid, MozInlineGrid,
#[cfg(feature = "gecko")] #[cfg(feature = "gecko")]
#[css(parse_condition = "moz_display_values_enabled")]
MozGridGroup, MozGridGroup,
#[cfg(feature = "gecko")] #[cfg(feature = "gecko")]
#[css(parse_condition = "moz_display_values_enabled")]
MozGridLine, MozGridLine,
#[cfg(feature = "gecko")] #[cfg(feature = "gecko")]
#[css(parse_condition = "moz_display_values_enabled")]
MozStack, MozStack,
#[cfg(feature = "gecko")] #[cfg(feature = "gecko")]
#[css(parse_condition = "moz_display_values_enabled")]
MozInlineStack, MozInlineStack,
#[cfg(feature = "gecko")] #[cfg(feature = "gecko")]
#[css(parse_condition = "moz_display_values_enabled")]
MozDeck, MozDeck,
#[cfg(feature = "gecko")] #[cfg(feature = "gecko")]
#[css(parse_condition = "moz_display_values_enabled")]
MozPopup, MozPopup,
#[cfg(feature = "gecko")] #[cfg(feature = "gecko")]
#[css(parse_condition = "moz_display_values_enabled")]
MozGroupbox, MozGroupbox,
} }