Skip to content

Commit

Permalink
Bug 1847139 - Use a versioned dependency on malloc_size_of_derive for…
Browse files Browse the repository at this point in the history
… standalone webrender. r=gfx-reviewers,jrmuizel

Differential Revision: https://phabricator.services.mozilla.com/D185384
  • Loading branch information
glandium committed Aug 4, 2023
1 parent 777476e commit 7d8fe87
Showing 5 changed files with 24 additions and 7 deletions.
3 changes: 3 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -194,6 +194,9 @@ minidump-writer = { git = "https://github.com/rust-minidump/minidump-writer.git"
minidump-common = { git = "https://github.com/rust-minidump/rust-minidump", rev = "87a29fba5e19cfae5ebf73a57ba31504a3872545" }
# warp 0.3.3 + https://github.com/seanmonstar/warp/pull/1007
warp = { git = "https://github.com/glandium/warp", rev = "4af45fae95bc98b0eba1ef0db17e1dac471bb23d" }
# Allow webrender to have a versioned dependency on the older crate on crates.io
# in order to build standalone.
malloc_size_of_derive = { path = "xpcom/rust/malloc_size_of_derive" }

# application-services overrides to make updating them all simpler.
interrupt-support = { git = "https://github.com/mozilla/application-services", rev = "25972c388a4cf3a6d8256504f3a09b711db2fc6a" }
22 changes: 18 additions & 4 deletions gfx/wr/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion gfx/wr/webrender/Cargo.toml
Original file line number Diff line number Diff line change
@@ -35,7 +35,7 @@ fxhash = "0.2.1"
gleam = "0.15.0"
lazy_static = "1"
log = "0.4"
malloc_size_of_derive = { path = "../../../xpcom/rust/malloc_size_of_derive" }
malloc_size_of_derive = "0.1"
num-traits = "0.2"
plane-split = "0.18"
png = { optional = true, version = "0.16" }
2 changes: 1 addition & 1 deletion gfx/wr/webrender_api/Cargo.toml
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@ app_units = "0.7.3"
bitflags = "1.2"
byteorder = "1.2.1"
euclid = { version = "0.22.6", features = ["serde"] }
malloc_size_of_derive = { path = "../../../xpcom/rust/malloc_size_of_derive" }
malloc_size_of_derive = "0.1"
serde = { version = "1.0", features = ["rc"] }
serde_derive = "1.0"
serde_bytes = "0.11"
2 changes: 1 addition & 1 deletion gfx/wr/wr_glyph_rasterizer/Cargo.toml
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@ gecko = ["firefox-on-glean", "glean"]
api = { version = "0.62.0", path = "../webrender_api", package = "webrender_api" }
euclid = { version = "0.22.0", features = ["serde"] }
malloc_size_of = { version = "0.0.2", path = "../wr_malloc_size_of", package = "wr_malloc_size_of" }
malloc_size_of_derive = { path = "../../../xpcom/rust/malloc_size_of_derive" }
malloc_size_of_derive = "0.1"
rayon = "1"
smallvec = "1"
tracy-rs = "0.1.2"

0 comments on commit 7d8fe87

Please sign in to comment.