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

Auto merge of #6640 - mrobinson:memory-profiling-for-compositor, r=nnethercote

Browse source 
Add memory profiling for the compositor task

Currently only the BufferMap is recorded, but a later change will also
measure the memory usage of the compositor tree.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6640)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-07-22 11:44:30 -06:00
commit 3f69eadc0d
10 changed files with 54 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ports/cef/Cargo.lock generated
View file

@ -671,7 +671,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "layers"
version = "0.1.0"
source = "git+https://github.com/servo/rust-layers#abc4f3803dde8d818343984a28d2e3d1fdad11a3"
source = "git+https://github.com/servo/rust-layers#1c9628618803c161753fd9f00f5ef781660ce11e"
dependencies = [
"azure 0.1.0 (git+https://github.com/servo/rust-azure)",
"cgl 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",

2
ports/cef/window.rs
View file

@ -474,7 +474,7 @@ struct CefCompositorProxy {
}
impl CompositorProxy for CefCompositorProxy {
fn send(&mut self, msg: compositor_task::Msg) {
fn send(&self, msg: compositor_task::Msg) {
self.sender.send(msg).unwrap();
app_wakeup();
}

2
ports/glutin/window.rs
View file

@ -805,7 +805,7 @@ struct GlutinCompositorProxy {
unsafe impl Send for GlutinCompositorProxy {}
impl CompositorProxy for GlutinCompositorProxy {
fn send(&mut self, msg: compositor_task::Msg) {
fn send(&self, msg: compositor_task::Msg) {
// Send a message and kick the OS event loop awake.
self.sender.send(msg).unwrap();
if let Some(ref window_proxy) = self.window_proxy {

2
ports/gonk/Cargo.lock generated
View file

@ -605,7 +605,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "layers"
version = "0.1.0"
source = "git+https://github.com/servo/rust-layers#abc4f3803dde8d818343984a28d2e3d1fdad11a3"
source = "git+https://github.com/servo/rust-layers#1c9628618803c161753fd9f00f5ef781660ce11e"
dependencies = [
"azure 0.1.0 (git+https://github.com/servo/rust-azure)",
"cgl 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",

2
ports/gonk/src/window.rs
View file

@ -857,7 +857,7 @@ struct GonkCompositorProxy {
}
impl CompositorProxy for GonkCompositorProxy {
fn send(&mut self, msg: compositor_task::Msg) {
fn send(&self, msg: compositor_task::Msg) {
// Send a message and kick the OS event loop awake.
self.sender.send(msg).ok().unwrap();
self.event_sender.send(WindowEvent::Idle).ok().unwrap();