2016-06-20 22:00:13 +00:00
|
|
|
[package]
|
|
|
|
|
name = "layout_thread"
|
|
|
|
|
version = "0.0.1"
|
|
|
|
|
authors = ["The Servo Project Developers"]
|
2016-07-14 16:33:18 +00:00
|
|
|
license = "MPL-2.0"
|
2016-06-20 22:00:13 +00:00
|
|
|
publish = false
|
|
|
|
|
|
|
|
|
|
[lib]
|
|
|
|
|
name = "layout_thread"
|
|
|
|
|
path = "lib.rs"
|
|
|
|
|
|
2017-10-13 17:26:39 +00:00
|
|
|
[features]
|
2018-01-22 17:11:44 +00:00
|
|
|
unstable = ["parking_lot/nightly"]
|
2017-10-13 17:26:39 +00:00
|
|
|
|
2016-06-20 22:00:13 +00:00
|
|
|
[dependencies]
|
2017-12-08 13:49:54 +00:00
|
|
|
app_units = "0.6"
|
2017-07-15 14:44:08 +00:00
|
|
|
atomic_refcell = "0.1"
|
2017-12-08 13:49:54 +00:00
|
|
|
euclid = "0.16"
|
2016-06-20 22:00:13 +00:00
|
|
|
fnv = "1.0"
|
|
|
|
|
gfx = {path = "../gfx"}
|
|
|
|
|
gfx_traits = {path = "../gfx_traits"}
|
2017-12-07 19:43:13 +00:00
|
|
|
html5ever = "0.22"
|
2017-10-16 17:54:02 +00:00
|
|
|
ipc-channel = "0.9"
|
2016-06-20 22:00:13 +00:00
|
|
|
layout = {path = "../layout"}
|
|
|
|
|
layout_traits = {path = "../layout_traits"}
|
2017-12-05 16:31:16 +00:00
|
|
|
lazy_static = "1"
|
2017-10-17 22:09:25 +00:00
|
|
|
libc = "0.2"
|
2016-06-20 22:00:13 +00:00
|
|
|
log = "0.3.5"
|
servo: Merge #18938 - Replace all uses of the `heapsize` crate with `malloc_size_of` (from nnethercote:bug-1409255); r=SimonSapin
Servo currently uses `heapsize`, but Stylo/Gecko use `malloc_size_of`.
`malloc_size_of` is better -- it handles various cases that `heapsize` does not
-- so this patch changes Servo to use `malloc_size_of`.
This patch makes the following changes to the `malloc_size_of` crate.
- Adds `MallocSizeOf` trait implementations for numerous types, some built-in
(e.g. `VecDeque`), some external and Servo-only (e.g. `string_cache`).
- Makes `enclosing_size_of_op` optional, because vanilla jemalloc doesn't
support that operation.
- For `HashSet`/`HashMap`, falls back to a computed estimate when
`enclosing_size_of_op` isn't available.
- Adds an extern "C" `malloc_size_of` function that does the actual heap
measurement; this is based on the same functions from the `heapsize` crate.
This patch makes the following changes elsewhere.
- Converts all the uses of `heapsize` to instead use `malloc_size_of`.
- Disables the "heapsize"/"heap_size" feature for the external crates that
provide it.
- Removes the `HeapSizeOf` implementation from `hashglobe`.
- Adds `ignore` annotations to a few `Rc`/`Arc`, because `malloc_size_of`
doesn't derive those types, unlike `heapsize`.
<!-- Please describe your changes on the following line: -->
---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [ ] These changes fix https://bugzilla.mozilla.org/show_bug.cgi?id=1409255
<!-- Either: -->
- [ ] There are tests for these changes OR
- [ ] These changes do not require tests because testing is on the Gecko side.
<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->
<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
Source-Repo: https://github.com/servo/servo
Source-Revision: 4c538b642e4bdfbf42c522c5a59c258a6d14546e
--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : f9a6feed1088d0b0be2b55d7f0c2ec9c594ac33b
2017-10-18 18:56:05 +00:00
|
|
|
malloc_size_of = { path = "../malloc_size_of" }
|
2017-07-20 18:34:35 +00:00
|
|
|
metrics = {path = "../metrics"}
|
2016-06-20 22:00:13 +00:00
|
|
|
msg = {path = "../msg"}
|
|
|
|
|
net_traits = {path = "../net_traits"}
|
2017-10-13 17:26:39 +00:00
|
|
|
parking_lot = "0.4"
|
2016-06-20 22:00:13 +00:00
|
|
|
profile_traits = {path = "../profile_traits"}
|
2017-07-15 14:44:08 +00:00
|
|
|
range = {path = "../range"}
|
2017-06-15 02:12:30 +00:00
|
|
|
rayon = "0.8"
|
2016-06-20 22:00:13 +00:00
|
|
|
script = {path = "../script"}
|
|
|
|
|
script_layout_interface = {path = "../script_layout_interface"}
|
|
|
|
|
script_traits = {path = "../script_traits"}
|
2017-02-09 00:06:06 +00:00
|
|
|
selectors = { path = "../selectors" }
|
2017-06-16 12:03:18 +00:00
|
|
|
serde_json = "1.0"
|
2017-10-19 14:15:17 +00:00
|
|
|
servo_allocator = {path = "../allocator"}
|
2017-07-19 13:03:17 +00:00
|
|
|
servo_arc = {path = "../servo_arc"}
|
2017-07-11 23:24:18 +00:00
|
|
|
servo_atoms = {path = "../atoms"}
|
2016-12-15 00:48:42 +00:00
|
|
|
servo_config = {path = "../config"}
|
|
|
|
|
servo_geometry = {path = "../geometry"}
|
2016-11-17 21:34:47 +00:00
|
|
|
servo_url = {path = "../url"}
|
2016-06-20 22:00:13 +00:00
|
|
|
style = {path = "../style"}
|
2017-07-31 18:13:26 +00:00
|
|
|
style_traits = {path = "../style_traits"}
|
2017-07-13 04:52:27 +00:00
|
|
|
webrender_api = {git = "https://github.com/servo/webrender", features = ["ipc"]}
|