mozilla-central: changeset 416191:dd68a30f619116cdb8ca2f313de814f0b697f17f

author	Emilio Cobos Álvarez <emilio@crisal.io>
	Sun, 29 Apr 2018 02:30:59 +0200
changeset 416191	dd68a30f619116cdb8ca2f313de814f0b697f17f
parent 416190	05350bbe9f8a75948567ef234d2cb151371b923e
child 416192	be9164913cc69fbf6dcdbbab6c582a54faadc8b5
push id	33918
push user	nerli@mozilla.com
push date	Sun, 29 Apr 2018 09:47:13 +0000
treeherder	mozilla-central@afbec7f03bd8 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	me
milestone	61.0a1
first release with	nightly linux32 c552490c8659 / 61.0a1 / 20180429220443 / files nightly linux64 c552490c8659 / 61.0a1 / 20180429220443 / files nightly mac c552490c8659 / 61.0a1 / 20180429220443 / files nightly win32 c552490c8659 / 61.0a1 / 20180429220443 / files nightly win64 c552490c8659 / 61.0a1 / 20180429220443 / files
last release without	nightly linux32 08f68e2c892c / 61.0a1 / 20180428220114 / files nightly linux64 08f68e2c892c / 61.0a1 / 20180428220114 / files nightly mac 08f68e2c892c / 61.0a1 / 20180428220114 / files nightly win32 08f68e2c892c / 61.0a1 / 20180428220114 / files nightly win64 08f68e2c892c / 61.0a1 / 20180428220114 / files

--- a/servo/components/style/values/generics/font.rs
+++ b/servo/components/style/values/generics/font.rs
@@ -222,16 +222,17 @@ impl Default for KeywordSize {
         KeywordSize::Medium
     }
 }
 
 /// A generic value for the `font-style` property.
 ///
 /// https://drafts.csswg.org/css-fonts-4/#font-style-prop
 #[allow(missing_docs)]
+#[cfg_attr(feature = "servo", derive(Deserialize, Serialize))]
 #[derive(Animate, Clone, ComputeSquaredDistance, Copy, Debug, MallocSizeOf,
          PartialEq, SpecifiedValueInfo, ToAnimatedValue, ToAnimatedZero)]
 pub enum FontStyle<Angle> {
     #[animation(error)]
     Normal,
     #[animation(error)]
     Italic,
     #[value_info(starts_with_keyword)]