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

style: Rename Expression to MediaFeatureExpression.

Browse source 
Which is more appropriate, given it represents a `<media-feature>` per spec, and
expression is a bit overloaded :)

Bug: 1422225
Reviewed-by: xidorn
MozReview-Commit-ID: Fed1nJhHxDu
This commit is contained in:
Emilio Cobos Álvarez 2018-06-15 21:29:57 -07:00
parent ef14e65636
commit e7cc548c35
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
5 changed files with 31 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

10
components/style/media_queries/media_query.rs
View file

@ -13,7 +13,7 @@ use selectors::parser::SelectorParseErrorKind;
use std::fmt::{self, Write};
use str::string_as_ascii_lowercase;
use style_traits::{CssWriter, ParseError, StyleParseErrorKind, ToCss};
use super::Expression;
use super::MediaFeatureExpression;
use values::CustomIdent;
/// <https://drafts.csswg.org/mediaqueries/#mq-prefix>
@ -65,8 +65,8 @@ pub struct MediaQuery {
pub qualifier: Option<Qualifier>,
/// The media type for this query, that can be known, unknown, or "all".
pub media_type: MediaQueryType,
/// The set of expressions that this media query contains.
pub expressions: Vec<Expression>,
/// The set of range expressions that this media query contains.
pub expressions: Vec<MediaFeatureExpression>,
}
impl ToCss for MediaQuery {
@ -143,7 +143,7 @@ impl MediaQuery {
}
// Without a media type, require at least one expression.
expressions.push(Expression::parse(context, input)?);
expressions.push(MediaFeatureExpression::parse(context, input)?);
MediaQueryType::All
},
@ -161,7 +161,7 @@ impl MediaQuery {
expressions,
});
}
expressions.push(Expression::parse(context, input)?)
expressions.push(MediaFeatureExpression::parse(context, input)?)
}
}
}

4
components/style/media_queries/mod.rs
View file

@ -13,6 +13,6 @@ pub use self::media_list::MediaList;
pub use self::media_query::{MediaQuery, MediaQueryType, MediaType, Qualifier};
#[cfg(feature = "servo")]
pub use servo::media_queries::{Device, Expression};
pub use servo::media_queries::{Device, MediaFeatureExpression};
#[cfg(feature = "gecko")]
pub use gecko::media_queries::{Device, Expression};
pub use gecko::media_queries::{Device, MediaFeatureExpression};