Bug 1521392 - Cherry-pick Servo-only changes to malloc_size_of.
authorEmilio Cobos Álvarez <emilio@crisal.io>
Sun, 20 Jan 2019 16:26:36 +0100
changeset 454624 fccd92c0fb3d0b56028fccbe8e184e96ea5e3b9e
parent 454623 fd43da99e9da96a448df3c0a21ed1e9e16482bcc
child 454625 666abafd77b1e8a5e8cb83824480ed99635f9684
push id35405
push userdvarga@mozilla.com
push dateSun, 20 Jan 2019 21:36:32 +0000
treeherdermozilla-central@666abafd77b1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1521392
milestone66.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1521392 - Cherry-pick Servo-only changes to malloc_size_of.
servo/components/malloc_size_of/Cargo.toml
servo/components/malloc_size_of/lib.rs
--- a/servo/components/malloc_size_of/Cargo.toml
+++ b/servo/components/malloc_size_of/Cargo.toml
@@ -28,27 +28,22 @@ servo = [
 app_units = "0.7"
 crossbeam-channel = { version = "0.3", optional = true }
 cssparser = "0.25"
 euclid = "0.19"
 hashglobe = { path = "../hashglobe" }
 hyper = { version = "0.12", optional = true }
 hyper_serde = { version = "0.9", optional = true }
 keyboard-types = {version = "0.4.3", optional = true}
+mozjs = { version = "0.10.0", optional = true}
 selectors = { path = "../selectors" }
 serde = { version = "1.0.27", optional = true }
 serde_bytes = { version = "0.10", optional = true }
 servo_arc = { path = "../servo_arc" }
 smallbitvec = "2.3.0"
 smallvec = "0.6"
 string_cache = { version = "0.7", optional = true }
 thin-slice = "0.1.0"
 time = { version = "0.1.17", optional = true }
 url = { version = "1.2", optional = true }
 webrender_api = { git = "https://github.com/servo/webrender", features = ["ipc"], optional = true }
 xml5ever = { version = "0.12", optional = true }
 void = "1.0.2"
-
-[target.'cfg(target_os = "android")'.dependencies]
-mozjs = { version = "0.9.5", optional = true, features=["init_once"]}
-
-[target.'cfg(not(target_os = "android"))'.dependencies]
-mozjs = { version = "0.9.5", optional = true}
--- a/servo/components/malloc_size_of/lib.rs
+++ b/servo/components/malloc_size_of/lib.rs
@@ -854,18 +854,16 @@ impl MallocSizeOf for url::Host {
 }
 #[cfg(feature = "webrender_api")]
 malloc_size_of_is_0!(webrender_api::BorderRadius);
 #[cfg(feature = "webrender_api")]
 malloc_size_of_is_0!(webrender_api::BorderStyle);
 #[cfg(feature = "webrender_api")]
 malloc_size_of_is_0!(webrender_api::BoxShadowClipMode);
 #[cfg(feature = "webrender_api")]
-malloc_size_of_is_0!(webrender_api::ClipAndScrollInfo);
-#[cfg(feature = "webrender_api")]
 malloc_size_of_is_0!(webrender_api::ColorF);
 #[cfg(feature = "webrender_api")]
 malloc_size_of_is_0!(webrender_api::ComplexClipRegion);
 #[cfg(feature = "webrender_api")]
 malloc_size_of_is_0!(webrender_api::ExtendMode);
 #[cfg(feature = "webrender_api")]
 malloc_size_of_is_0!(webrender_api::FilterOp);
 #[cfg(feature = "webrender_api")]