Derive Serialize and Deserialize traits for font styles for #[cfg_att…

…r(feature = "servo")]
servo · Jun 12, 2020 · 8372cf1 · 8372cf1
1 parent 6c86429
commit 8372cf1
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 23 deletions.
diff --git a/components/canvas/canvas_data.rs b/components/canvas/canvas_data.rs
@@ -409,7 +409,6 @@ pub struct CanvasData<'a> {
     /// An old webrender image key that can be deleted when the current epoch ends.
     very_old_image_key: Option<webrender_api::ImageKey>,
     font_cache_thread: Mutex<FontCacheThread>,
-    _canvas_id: CanvasId,
 }
 
 fn create_backend() -> Box<dyn Backend> {
@@ -421,7 +420,6 @@ impl<'a> CanvasData<'a> {
         size: Size2D<u64>,
         webrender_api: Box<dyn WebrenderApi>,
         antialias: AntialiasMode,
-        canvas_id: CanvasId,
         font_cache_thread: FontCacheThread,
     ) -> CanvasData<'a> {
         let backend = create_backend();
@@ -437,7 +435,6 @@ impl<'a> CanvasData<'a> {
             old_image_key: None,
             very_old_image_key: None,
             font_cache_thread: Mutex::new(font_cache_thread),
-            _canvas_id: canvas_id,
         }
     }
 
@@ -495,6 +492,7 @@ impl<'a> CanvasData<'a> {
         }
     }
 
+    // https://html.spec.whatwg.org/multipage/#text-preparation-algorithm
     pub fn fill_text(
         &mut self,
         text: String,

diff --git a/components/canvas/canvas_paint_thread.rs b/components/canvas/canvas_paint_thread.rs
@@ -134,7 +134,6 @@ impl<'a> CanvasPaintThread<'a> {
             size,
             self.webrender_api.clone(),
             antialias,
-            canvas_id.clone(),
             font_cache_thread,
         );
         self.canvases.insert(canvas_id.clone(), canvas_data);

diff --git a/components/style/properties/properties.mako.rs b/components/style/properties/properties.mako.rs
@@ -2601,7 +2601,8 @@ pub mod style_structs {
 
     % for style_struct in data.active_style_structs():
         % if style_struct.name == "Font":
-        #[derive(Clone, Debug, MallocSizeOf, Serialize, Deserialize)]
+        #[derive(Clone, Debug, MallocSizeOf)]
+        #[cfg_attr(feature = "servo", derive(Serialize, Deserialize))]
         % else:
         #[derive(Clone, Debug, MallocSizeOf, PartialEq)]
         % endif

diff --git a/components/style/values/computed/font.rs b/components/style/values/computed/font.rs
@@ -93,9 +93,8 @@ impl From<FontWeight> for FontKitFontWeight {
     ToAnimatedZero,
     ToCss,
     ToResolvedValue,
-    Serialize,
-    Deserialize,
 )]
+#[cfg_attr(feature = "servo", derive(Serialize, Deserialize))]
 /// The computed value of font-size
 pub struct FontSize {
     /// The size.
@@ -478,20 +477,10 @@ impl From<&SingleFontFamily> for FontKitFamilyName {
     }
 }
 
-#[cfg(feature = "servo")]
 #[derive(
-    Clone,
-    Debug,
-    Eq,
-    Hash,
-    MallocSizeOf,
-    PartialEq,
-    ToComputedValue,
-    ToResolvedValue,
-    ToShmem,
-    Serialize,
-    Deserialize,
+    Clone, Debug, Eq, Hash, MallocSizeOf, PartialEq, ToComputedValue, ToResolvedValue, ToShmem,
 )]
+#[cfg_attr(feature = "servo", derive(Serialize, Deserialize))]
 /// A list of SingleFontFamily
 pub struct FontFamilyList(Box<[SingleFontFamily]>);
 

diff --git a/components/style/values/specified/font.rs b/components/style/values/specified/font.rs
@@ -496,9 +496,8 @@ impl ToComputedValue for FontStretch {
     ToCss,
     ToResolvedValue,
     ToShmem,
-    Serialize,
-    Deserialize,
 )]
+#[cfg_attr(feature = "servo", derive(Serialize, Deserialize))]
 #[allow(missing_docs)]
 pub enum KeywordSize {
     #[css(keyword = "xx-small")]
@@ -542,9 +541,8 @@ impl Default for KeywordSize {
     ToCss,
     ToResolvedValue,
     ToShmem,
-    Serialize,
-    Deserialize,
 )]
+#[cfg_attr(feature = "servo", derive(Serialize, Deserialize))]
 /// Additional information for keyword-derived font sizes.
 pub struct KeywordInfo {
     /// The keyword used