From 94eb1591374ba0b90ada60d962d5d0ed250991e2 Mon Sep 17 00:00:00 2001
From: Simon Sapin <simon.sapin@exyr.org>
Date: Tue, 28 Mar 2017 17:50:52 +0200
Subject: [PATCH] Remove heapsize for Stylo

---
 components/style/Cargo.toml                     | 4 ++--
 components/style/gecko_bindings/sugar/refptr.rs | 5 -----
 components/style/gecko_string_cache/mod.rs      | 7 -------
 components/style/lib.rs                         | 2 +-
 4 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/components/style/Cargo.toml b/components/style/Cargo.toml
index b5ec4e4a31d..12648c8d104 100644
--- a/components/style/Cargo.toml
+++ b/components/style/Cargo.toml
@@ -15,7 +15,7 @@ doctest = false
 [features]
 gecko = ["nsstring_vendor", "rayon/unstable", "num_cpus"]
 use_bindgen = ["bindgen", "regex"]
-servo = ["serde/unstable", "serde", "serde_derive", "heapsize_derive",
+servo = ["serde/unstable", "serde", "serde_derive", "heapsize", "heapsize_derive",
          "style_traits/servo", "servo_atoms", "html5ever-atoms",
          "cssparser/heapsize", "cssparser/serde", "encoding",
          "rayon/unstable", "servo_url/servo"]
@@ -30,7 +30,7 @@ cssparser = "0.12"
 encoding = {version = "0.2", optional = true}
 euclid = "0.11"
 fnv = "1.0"
-heapsize = "0.3.0"
+heapsize = {version = "0.3.0", optional = true}
 heapsize_derive = {version = "0.1", optional = true}
 html5ever-atoms = {version = "0.2", optional = true}
 lazy_static = "0.2"
diff --git a/components/style/gecko_bindings/sugar/refptr.rs b/components/style/gecko_bindings/sugar/refptr.rs
index 0202afb3292..409443dd978 100644
--- a/components/style/gecko_bindings/sugar/refptr.rs
+++ b/components/style/gecko_bindings/sugar/refptr.rs
@@ -6,7 +6,6 @@
 
 use gecko_bindings::structs;
 use gecko_bindings::sugar::ownership::HasArcFFI;
-use heapsize::HeapSizeOf;
 use std::{mem, ptr};
 use std::marker::PhantomData;
 use std::ops::{Deref, DerefMut};
@@ -222,10 +221,6 @@ impl<T: RefCounted> Clone for RefPtr<T> {
     }
 }
 
-impl<T: RefCounted> HeapSizeOf for RefPtr<T> {
-    fn heap_size_of_children(&self) -> usize { 0 }
-}
-
 impl<T: RefCounted> PartialEq for RefPtr<T> {
     fn eq(&self, other: &Self) -> bool {
         self.ptr == other.ptr
diff --git a/components/style/gecko_string_cache/mod.rs b/components/style/gecko_string_cache/mod.rs
index 1c44df4eb17..b464d459a0e 100644
--- a/components/style/gecko_string_cache/mod.rs
+++ b/components/style/gecko_string_cache/mod.rs
@@ -10,7 +10,6 @@ use gecko_bindings::bindings::Gecko_AddRefAtom;
 use gecko_bindings::bindings::Gecko_Atomize;
 use gecko_bindings::bindings::Gecko_ReleaseAtom;
 use gecko_bindings::structs::nsIAtom;
-use heapsize::HeapSizeOf;
 use std::borrow::{Cow, Borrow};
 use std::char::{self, DecodeUtf16};
 use std::fmt::{self, Write};
@@ -237,12 +236,6 @@ impl Default for Atom {
     }
 }
 
-impl HeapSizeOf for Atom {
-    fn heap_size_of_children(&self) -> usize {
-        0
-    }
-}
-
 impl fmt::Debug for Atom {
     fn fmt(&self, w: &mut fmt::Formatter) -> fmt::Result {
         write!(w, "Gecko Atom({:p}, {})", self.0, self)
diff --git a/components/style/lib.rs b/components/style/lib.rs
index ddb58538802..e1c1eaa5ac5 100644
--- a/components/style/lib.rs
+++ b/components/style/lib.rs
@@ -46,7 +46,7 @@ extern crate bitflags;
 extern crate euclid;
 extern crate fnv;
 #[cfg(feature = "gecko")] #[macro_use] pub mod gecko_string_cache;
-extern crate heapsize;
+#[cfg(feature = "servo")] extern crate heapsize;
 #[cfg(feature = "servo")] #[macro_use] extern crate heapsize_derive;
 #[cfg(feature = "servo")] #[macro_use] extern crate html5ever_atoms;
 #[macro_use]