diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2017-09-12 08:40:56 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-12 08:40:56 -0500 |
commit | bffe158fa40fda72e74afde2407cc02cd84d495d (patch) | |
tree | 15724631362f331918f5ce71f26500b732eef785 /components/layout | |
parent | 6ca456ca21ef9429e4da0a86c45ca0a9a77b7524 (diff) | |
parent | 779fbda81d53a7243c254f845fc6a226a7f2a333 (diff) | |
download | servo-bffe158fa40fda72e74afde2407cc02cd84d495d.tar.gz servo-bffe158fa40fda72e74afde2407cc02cd84d495d.zip |
Auto merge of #18455 - nnethercote:measure-Arc-Locked-properly, r=jdm
Measure Arc<Locked<T>> fields properly.
Currently when we measure various Arc<Locked<T>> fields we don't measure the T
itself, but only the descendants of the T. This patch fixes this.
This fix requires introducing a new trait, MallocUnconditionalShallowSizeOf,
which is implemented for servo_arc::Arc. A similar trait,
MallocConditionalShallowSizeOf, is also introduced, though it has no uses as
yet.
<!-- 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 #__ (github issue number if applicable).
<!-- Either: -->
- [ ] There are tests for these changes OR
- [X] These changes do not require tests because they are tested in Gecko.
<!-- 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. -->
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/18455)
<!-- Reviewable:end -->
Diffstat (limited to 'components/layout')
0 files changed, 0 insertions, 0 deletions