Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 22:15:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #8550 - toothbrush7777777:patch-1, r=frewsxcv

Browse source 
Fixes #8546

Fixes issue #8546.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8550)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-11-16 23:44:58 +05:30
commit 4b0330937a
1 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
components/compositing/compositor.rs
View file

@ -615,20 +615,18 @@ impl<Window: WindowMethods> IOCompositor<Window> {
} }
(Msg::CollectMemoryReports(reports_chan), ShutdownState::NotShuttingDown) => { (Msg::CollectMemoryReports(reports_chan), ShutdownState::NotShuttingDown) => {
let mut reports = vec![];
let name = "compositor-task"; let name = "compositor-task";
// These are both `ExplicitUnknownLocationSize` because the memory might be in the // These are both `ExplicitUnknownLocationSize` because the memory might be in the
// GPU or on the heap. // GPU or on the heap.
reports.push(mem::Report { let reports = vec![mem::Report {
path: path![name, "surface-map"], path: path![name, "surface-map"],
kind: ReportKind::ExplicitUnknownLocationSize, kind: ReportKind::ExplicitUnknownLocationSize,
size: self.surface_map.mem(), size: self.surface_map.mem(),
}); }, mem::Report {
reports.push(mem::Report {
path: path![name, "layer-tree"], path: path![name, "layer-tree"],
kind: ReportKind::ExplicitUnknownLocationSize, kind: ReportKind::ExplicitUnknownLocationSize,
size: self.scene.get_memory_usage(), size: self.scene.get_memory_usage(),
}); }];
reports_chan.send(reports); reports_chan.send(reports);
} }