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: Don't allow to parse image-set(none).

Browse source 
`none` is not technically part of the `<image>` syntax. Tests in following
patches.

Depends on D100698

Differential Revision: https://phabricator.services.mozilla.com/D100699
This commit is contained in:
Emilio Cobos Álvarez 2021-02-26 11:31:50 +01:00
parent a0c6628cf2
commit c4ad61faa5
1 changed files with 20 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

31
components/style/values/specified/image.rs
View file

@ -180,7 +180,7 @@ impl Parse for Image {
context: &ParserContext, context: &ParserContext,
input: &mut Parser<'i, 't>, input: &mut Parser<'i, 't>,
) -> Result<Image, ParseError<'i>> { ) -> Result<Image, ParseError<'i>> {
Image::parse_with_cors_mode(context, input, CorsMode::None) Image::parse_with_cors_mode(context, input, CorsMode::None, /* allow_none = */ true)
} }
} }
@ -189,8 +189,9 @@ impl Image {
context: &ParserContext, context: &ParserContext,
input: &mut Parser<'i, 't>, input: &mut Parser<'i, 't>,
cors_mode: CorsMode, cors_mode: CorsMode,
allow_none: bool,
) -> Result<Image, ParseError<'i>> { ) -> Result<Image, ParseError<'i>> {
if input.try_parse(|i| i.expect_ident_matching("none")).is_ok() { if allow_none && input.try_parse(|i| i.expect_ident_matching("none")).is_ok() {
return Ok(generic::Image::None); return Ok(generic::Image::None);
} }
if let Ok(url) = input.try_parse(|input| SpecifiedImageUrl::parse_with_cors_mode(context, input, cors_mode)) { if let Ok(url) = input.try_parse(|input| SpecifiedImageUrl::parse_with_cors_mode(context, input, cors_mode)) {
@ -249,14 +250,11 @@ impl Image {
/// Provides an alternate method for parsing that associates the URL with /// Provides an alternate method for parsing that associates the URL with
/// anonymous CORS headers. /// anonymous CORS headers.
///
/// FIXME(emilio): It'd be nicer for this to pass a `CorsMode` parameter to
/// a shared function instead.
pub fn parse_with_cors_anonymous<'i, 't>( pub fn parse_with_cors_anonymous<'i, 't>(
context: &ParserContext, context: &ParserContext,
input: &mut Parser<'i, 't>, input: &mut Parser<'i, 't>,
) -> Result<Image, ParseError<'i>> { ) -> Result<Image, ParseError<'i>> {
Self::parse_with_cors_mode(context, input, CorsMode::Anonymous) Self::parse_with_cors_mode(context, input, CorsMode::Anonymous, /* allow_none = */ true)
} }
} }
@ -295,17 +293,28 @@ impl CrossFadeElement {
} }
} }
impl PercentOrNone { impl CrossFadeImage {
fn parse_or_none<'i, 't>( fn parse<'i, 't>(
context: &ParserContext, context: &ParserContext,
input: &mut Parser<'i, 't>, input: &mut Parser<'i, 't>,
) -> Self { cors_mode: CorsMode,
) -> Result<Self, ParseError<'i>> {
if let Ok(image) = input.try_parse(|input| Image::parse_with_cors_mode(context, input, cors_mode, /* allow_none = */ false)) {
return Ok(Self::Image(image))
}
Ok(Self::Color(Color::parse(context, input)?))
}
}
impl PercentOrNone {
fn parse_or_none<'i, 't>(context: &ParserContext, input: &mut Parser<'i, 't>) -> Self {
// We clamp our values here as this is the way that Safari and // We clamp our values here as this is the way that Safari and
// Chrome's implementation handle out-of-bounds percentages // Chrome's implementation handle out-of-bounds percentages
// but whether or not this behavior follows the specification // but whether or not this behavior follows the specification
// is still being discussed. See: // is still being discussed. See:
// <https://github.com/w3c/csswg-drafts/issues/5333> // <https://github.com/w3c/csswg-drafts/issues/5333>
if let Ok(percent) = input.try_parse(|input| Percentage::parse_non_negative(context, input)) { if let Ok(percent) = input.try_parse(|input| Percentage::parse_non_negative(context, input))
{
Self::Percent(percent.clamp_to_hundred()) Self::Percent(percent.clamp_to_hundred())
} else { } else {
Self::None Self::None
@ -338,7 +347,7 @@ impl ImageSetItem {
) -> Result<Self, ParseError<'i>> { ) -> Result<Self, ParseError<'i>> {
let image = match input.try_parse(|i| i.expect_url_or_string()) { let image = match input.try_parse(|i| i.expect_url_or_string()) {
Ok(url) => Image::Url(SpecifiedImageUrl::parse_from_string(url.as_ref().into(), context, cors_mode)), Ok(url) => Image::Url(SpecifiedImageUrl::parse_from_string(url.as_ref().into(), context, cors_mode)),
Err(..) => Image::parse(context, input)?, Err(..) => Image::parse_with_cors_mode(context, input, cors_mode, /* allow_none = */ false)?,
}; };
let resolution = input.try_parse(|input| Resolution::parse(context, input)).unwrap_or(Resolution::X(1.0)); let resolution = input.try_parse(|input| Resolution::parse(context, input)).unwrap_or(Resolution::X(1.0));
Ok(Self { Ok(Self {