Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 13:21:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1521392 - Cherry-pick Servo-only changes to malloc_size_of.

Browse Source
This commit is contained in:
Emilio Cobos Álvarez 2019-01-20 16:26:36 +01:00
parent ea73c6b7e9
commit 9a934ed822
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
servo/components/malloc_size_of/Cargo.toml
View File

@ -33,6 +33,7 @@ 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 }
@ -46,9 +47,3 @@ 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}

2
servo/components/malloc_size_of/lib.rs
View File

@ -859,8 +859,6 @@ 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);