style: Use serde to serialize LengthPercentage and StyleRayFunction.

We need to pass these two types into the compositor, so we need a better way to serialize these rust types. We use serde and bincode to serialize/deserialize them, and use ByteBuf to pass the &[u8] data through IPC. We define StyleVecU8 for FFI usage only. Differential Revision: https://phabricator.services.mozilla.com/D50688
servo · Nov 4, 2019 · 40ede5b · 40ede5b
1 parent d99606a
commit 40ede5b
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 8 deletions.
diff --git a/components/style/lib.rs b/components/style/lib.rs
@@ -78,7 +78,6 @@ extern crate parking_lot;
 extern crate precomputed_hash;
 extern crate rayon;
 extern crate selectors;
-#[cfg(feature = "servo")]
 #[macro_use]
 extern crate serde;
 pub extern crate servo_arc;

diff --git a/components/style/values/computed/angle.rs b/components/style/values/computed/angle.rs
@@ -13,16 +13,17 @@ use std::{f32, f64};
 use style_traits::{CssWriter, ToCss};
 
 /// A computed angle in degrees.
-#[cfg_attr(feature = "servo", derive(Deserialize, Serialize))]
 #[derive(
     Add,
     Animate,
     Clone,
     Copy,
     Debug,
+    Deserialize,
     MallocSizeOf,
     PartialEq,
     PartialOrd,
+    Serialize,
     ToAnimatedZero,
     ToResolvedValue,
 )]

diff --git a/components/style/values/computed/length.rs b/components/style/values/computed/length.rs
@@ -75,7 +75,9 @@ impl ToComputedValue for specified::Length {
 ///
 /// https://drafts.csswg.org/css-values-4/#typedef-length-percentage
 #[allow(missing_docs)]
-#[derive(Clone, Copy, Debug, MallocSizeOf, ToAnimatedZero, ToResolvedValue)]
+#[derive(
+    Clone, Copy, Debug, Deserialize, MallocSizeOf, Serialize, ToAnimatedZero, ToResolvedValue,
+)]
 #[repr(C)]
 pub struct LengthPercentage {
     length: Length,
@@ -611,9 +613,11 @@ impl Size {
     Clone,
     ComputeSquaredDistance,
     Copy,
+    Deserialize,
     MallocSizeOf,
     PartialEq,
     PartialOrd,
+    Serialize,
     ToAnimatedValue,
     ToAnimatedZero,
     ToResolvedValue,

diff --git a/components/style/values/computed/percentage.rs b/components/style/values/computed/percentage.rs
@@ -12,17 +12,18 @@ use std::fmt;
 use style_traits::{CssWriter, ToCss};
 
 /// A computed percentage.
-#[cfg_attr(feature = "servo", derive(Deserialize, Serialize))]
 #[derive(
     Animate,
     Clone,
     ComputeSquaredDistance,
     Copy,
     Debug,
     Default,
+    Deserialize,
     MallocSizeOf,
     PartialEq,
     PartialOrd,
+    Serialize,
     SpecifiedValueInfo,
     ToAnimatedValue,
     ToAnimatedZero,

diff --git a/components/style/values/generics/motion.rs b/components/style/values/generics/motion.rs
@@ -14,9 +14,11 @@ use crate::values::specified::SVGPathData;
     Clone,
     Copy,
     Debug,
+    Deserialize,
     MallocSizeOf,
     Parse,
     PartialEq,
+    Serialize,
     SpecifiedValueInfo,
     ToAnimatedZero,
     ToComputedValue,
@@ -41,8 +43,10 @@ pub enum RaySize {
     Clone,
     ComputeSquaredDistance,
     Debug,
+    Deserialize,
     MallocSizeOf,
     PartialEq,
+    Serialize,
     SpecifiedValueInfo,
     ToAnimatedZero,
     ToComputedValue,

diff --git a/components/style_traits/Cargo.toml b/components/style_traits/Cargo.toml
@@ -10,7 +10,7 @@ name = "style_traits"
 path = "lib.rs"
 
 [features]
-servo = ["serde", "servo_atoms", "cssparser/serde", "webrender_api", "servo_url", "euclid/serde"]
+servo = ["servo_atoms", "cssparser/serde", "webrender_api", "servo_url", "euclid/serde"]
 gecko = []
 
 [dependencies]
@@ -22,7 +22,7 @@ lazy_static = "1"
 malloc_size_of = { path = "../malloc_size_of" }
 malloc_size_of_derive = "0.1"
 selectors = { path = "../selectors" }
-serde = {version = "1.0", optional = true}
+serde = "1.0"
 webrender_api = {git = "https://github.com/servo/webrender", optional = true}
 servo_atoms = {path = "../atoms", optional = true}
 servo_arc = { path = "../servo_arc" }

diff --git a/components/style_traits/lib.rs b/components/style_traits/lib.rs
@@ -22,7 +22,6 @@ extern crate malloc_size_of;
 #[macro_use]
 extern crate malloc_size_of_derive;
 extern crate selectors;
-#[cfg(feature = "servo")]
 #[macro_use]
 extern crate serde;
 extern crate servo_arc;

diff --git a/components/style_traits/values.rs b/components/style_traits/values.rs
@@ -507,7 +507,9 @@ pub mod specified {
 
     /// Whether to allow negative lengths or not.
     #[repr(u8)]
-    #[derive(Clone, Copy, Debug, Eq, MallocSizeOf, PartialEq, PartialOrd, ToShmem)]
+    #[derive(
+        Clone, Copy, Debug, Deserialize, Eq, MallocSizeOf, PartialEq, PartialOrd, Serialize, ToShmem,
+    )]
     pub enum AllowedNumericType {
         /// Allow all kind of numeric values.
         All,