Chromium Code Reviews| Index: content/public/test/test_synchronous_compositor_android.cc |
| diff --git a/content/public/test/test_synchronous_compositor_android.cc b/content/public/test/test_synchronous_compositor_android.cc |
| index 7f9bd2359b6402096882db250c11a7ae07065f0f..97b68c8d9e81bc671671f6f4f0b9f6e73e4c4e6f 100644 |
| --- a/content/public/test/test_synchronous_compositor_android.cc |
| +++ b/content/public/test/test_synchronous_compositor_android.cc |
| @@ -10,20 +10,21 @@ |
| namespace content { |
| -TestSynchronousCompositor::TestSynchronousCompositor() : client_(NULL) { |
| -} |
| +TestSynchronousCompositor::TestSynchronousCompositor(int process_id, |
| + int routing_id) |
| + : client_(NULL), process_id_(process_id), routing_id_(routing_id) {} |
| TestSynchronousCompositor::~TestSynchronousCompositor() { |
| SetClient(NULL); |
| } |
| void TestSynchronousCompositor::SetClient(SynchronousCompositorClient* client) { |
| - if (client_) |
| - client_->DidDestroyCompositor(this, 0, 0); |
| - client_ = client; |
| if (client_) { |
|
boliu
2016/06/21 22:06:24
nit: no need for braces
hush (inactive)
2016/06/21 22:11:33
Done.
|
| - client_->DidInitializeCompositor(this, 0, 0); |
| + client_->DidDestroyCompositor(this, process_id_, routing_id_); |
| } |
| + client_ = client; |
| + if (client_) |
| + client_->DidInitializeCompositor(this, process_id_, routing_id_); |
| } |
| SynchronousCompositor::Frame TestSynchronousCompositor::DemandDrawHw( |