aboutsummaryrefslogtreecommitdiffstats
path: root/components
diff options
context:
space:
mode:
authorAnthony Ramine <n.oxyde@gmail.com>2018-01-30 10:09:53 +0100
committerAnthony Ramine <n.oxyde@gmail.com>2018-02-01 10:04:27 +0100
commit3fba02a0d623750a92d32547c794871db5c97048 (patch)
tree37b41a31021fe26230311a3bcddfe1663ed04676 /components
parente6d9c251d1b9770aa520bf358b79d906a00d71bb (diff)
downloadservo-3fba02a0d623750a92d32547c794871db5c97048.tar.gz
servo-3fba02a0d623750a92d32547c794871db5c97048.zip
Fix naming of ExtremumLength variants
Diffstat (limited to 'components')
-rw-r--r--components/style/gecko/values.rs16
-rw-r--r--components/style/values/mod.rs8
2 files changed, 12 insertions, 12 deletions
diff --git a/components/style/gecko/values.rs b/components/style/gecko/values.rs
index fc5d75bbe4b..d24e9ea33ac 100644
--- a/components/style/gecko/values.rs
+++ b/components/style/gecko/values.rs
@@ -348,10 +348,10 @@ impl GeckoStyleCoordConvertible for ExtremumLength {
use gecko_bindings::structs::{NS_STYLE_WIDTH_MAX_CONTENT, NS_STYLE_WIDTH_MIN_CONTENT};
coord.set_value(CoordDataValue::Enumerated(
match *self {
- ExtremumLength::MaxContent => NS_STYLE_WIDTH_MAX_CONTENT,
- ExtremumLength::MinContent => NS_STYLE_WIDTH_MIN_CONTENT,
- ExtremumLength::FitContent => NS_STYLE_WIDTH_FIT_CONTENT,
- ExtremumLength::FillAvailable => NS_STYLE_WIDTH_AVAILABLE,
+ ExtremumLength::MozMaxContent => NS_STYLE_WIDTH_MAX_CONTENT,
+ ExtremumLength::MozMinContent => NS_STYLE_WIDTH_MIN_CONTENT,
+ ExtremumLength::MozFitContent => NS_STYLE_WIDTH_FIT_CONTENT,
+ ExtremumLength::MozAvailable => NS_STYLE_WIDTH_AVAILABLE,
}
))
}
@@ -361,12 +361,12 @@ impl GeckoStyleCoordConvertible for ExtremumLength {
use gecko_bindings::structs::{NS_STYLE_WIDTH_MAX_CONTENT, NS_STYLE_WIDTH_MIN_CONTENT};
match coord.as_value() {
CoordDataValue::Enumerated(NS_STYLE_WIDTH_MAX_CONTENT) =>
- Some(ExtremumLength::MaxContent),
+ Some(ExtremumLength::MozMaxContent),
CoordDataValue::Enumerated(NS_STYLE_WIDTH_MIN_CONTENT) =>
- Some(ExtremumLength::MinContent),
+ Some(ExtremumLength::MozMinContent),
CoordDataValue::Enumerated(NS_STYLE_WIDTH_FIT_CONTENT) =>
- Some(ExtremumLength::FitContent),
- CoordDataValue::Enumerated(NS_STYLE_WIDTH_AVAILABLE) => Some(ExtremumLength::FillAvailable),
+ Some(ExtremumLength::MozFitContent),
+ CoordDataValue::Enumerated(NS_STYLE_WIDTH_AVAILABLE) => Some(ExtremumLength::MozAvailable),
_ => None,
}
}
diff --git a/components/style/values/mod.rs b/components/style/values/mod.rs
index 601b5edc5ac..1668c103def 100644
--- a/components/style/values/mod.rs
+++ b/components/style/values/mod.rs
@@ -198,7 +198,7 @@ impl ToCss for KeyframesName {
// A type for possible values for min- and max- flavors of width,
// height, block-size, and inline-size.
define_css_keyword_enum!(ExtremumLength:
- "-moz-max-content" => MaxContent,
- "-moz-min-content" => MinContent,
- "-moz-fit-content" => FitContent,
- "-moz-available" => FillAvailable);
+ "-moz-max-content" => MozMaxContent,
+ "-moz-min-content" => MozMinContent,
+ "-moz-fit-content" => MozFitContent,
+ "-moz-available" => MozAvailable);