diff options
author | Jan Beich <jbeich@FreeBSD.org> | 2020-04-30 03:22:50 +0000 |
---|---|---|
committer | Jan Beich <jbeich@FreeBSD.org> | 2020-04-30 03:22:50 +0000 |
commit | a7453b73e17a3f7309c676378f863f22134ad219 (patch) | |
tree | 752e9e7a28dd3dccd82c3e12c90c8e8074f58608 /www/firefox-esr/files | |
parent | 443c2adddec06f9608c560984cf3eccc0136eb4e (diff) | |
download | ports-a7453b73e17a3f7309c676378f863f22134ad219.tar.gz ports-a7453b73e17a3f7309c676378f863f22134ad219.zip |
Notes
Diffstat (limited to 'www/firefox-esr/files')
-rw-r--r-- | www/firefox-esr/files/patch-bug1580963 | 61 |
1 files changed, 0 insertions, 61 deletions
diff --git a/www/firefox-esr/files/patch-bug1580963 b/www/firefox-esr/files/patch-bug1580963 deleted file mode 100644 index 214c3d8f25c9..000000000000 --- a/www/firefox-esr/files/patch-bug1580963 +++ /dev/null @@ -1,61 +0,0 @@ -From 7617a0e6fe2bb7afab6ffda49fc8cd9eca2f035b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io> -Date: Thu, 12 Sep 2019 21:09:27 +0000 -Subject: [PATCH] Bug 1580963 - Cherry-pick some servo changes from a rustc - upgrade. - -This cherry-picks from Servo commit 98e4a53b724. - -Differential Revision: https://phabricator.services.mozilla.com/D45738 - ---HG-- -extra : moz-landing-system : lando ---- - .../style/stylesheets/viewport_rule.rs | 23 +++++++++++++------ - 1 file changed, 16 insertions(+), 7 deletions(-) - -diff --git a/servo/components/style/stylesheets/viewport_rule.rs b/servo/components/style/stylesheets/viewport_rule.rs -index 8cc858f7a7f69..7d0881e3336a9 100644 ---- servo/components/style/stylesheets/viewport_rule.rs -+++ servo/components/style/stylesheets/viewport_rule.rs -@@ -291,15 +291,18 @@ impl<'a, 'b, 'i> DeclarationParser<'i> for ViewportRuleParser<'a, 'b> { - ) -> Result<Vec<ViewportDescriptorDeclaration>, ParseError<'i>> { - macro_rules! declaration { - ($declaration:ident($parse:expr)) => { -- declaration!($declaration(value: try!($parse(input)), -- important: input.try(parse_important).is_ok())) -+ declaration!($declaration { -+ value: $parse(input)?, -+ important: input.try(parse_important).is_ok(), -+ }) - }; -- ($declaration:ident(value: $value:expr, important: $important:expr)) => { -+ ($declaration:ident { value: $value:expr, important: $important:expr, }) => { - ViewportDescriptorDeclaration::new( - self.context.stylesheet_origin, - ViewportDescriptor::$declaration($value), -- $important) -- } -+ $important, -+ ) -+ }; - } - - macro_rules! ok { -@@ -311,8 +314,14 @@ impl<'a, 'b, 'i> DeclarationParser<'i> for ViewportRuleParser<'a, 'b> { - let important = input.try(parse_important).is_ok(); - - Ok(vec![ -- declaration!($min(value: shorthand.0, important: important)), -- declaration!($max(value: shorthand.1, important: important)), -+ declaration!($min { -+ value: shorthand.0, -+ important: important, -+ }), -+ declaration!($max { -+ value: shorthand.1, -+ important: important, -+ }), - ]) - }}; - } |