OLD | NEW |
1 // Copyright 2011 The Chromium Authors. All rights reserved. | 1 // Copyright 2011 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "cc/test/threaded_channel_for_test.h" | 5 #include "cc/test/threaded_channel_for_test.h" |
6 | 6 |
7 #include "cc/test/proxy_impl_for_test.h" | 7 #include "cc/test/proxy_impl_for_test.h" |
8 | 8 |
9 namespace cc { | 9 namespace cc { |
10 | 10 |
11 scoped_ptr<ThreadedChannel> ThreadedChannelForTest::Create( | 11 scoped_ptr<ThreadedChannelForTest> ThreadedChannelForTest::Create( |
12 TestHooks* test_hooks, | 12 TestHooks* test_hooks, |
13 ProxyMain* proxy_main, | 13 ProxyMain* proxy_main, |
14 TaskRunnerProvider* task_runner_provider) { | 14 TaskRunnerProvider* task_runner_provider) { |
15 return make_scoped_ptr( | 15 return make_scoped_ptr( |
16 new ThreadedChannelForTest(test_hooks, proxy_main, task_runner_provider)); | 16 new ThreadedChannelForTest(test_hooks, proxy_main, task_runner_provider)); |
17 } | 17 } |
18 | 18 |
19 ThreadedChannelForTest::ThreadedChannelForTest( | 19 ThreadedChannelForTest::ThreadedChannelForTest( |
20 TestHooks* test_hooks, | 20 TestHooks* test_hooks, |
21 ProxyMain* proxy_main, | 21 ProxyMain* proxy_main, |
22 TaskRunnerProvider* task_runner_provider) | 22 TaskRunnerProvider* task_runner_provider) |
23 : ThreadedChannel(proxy_main, task_runner_provider), | 23 : ThreadedChannel(proxy_main, task_runner_provider), |
24 test_hooks_(test_hooks) {} | 24 test_hooks_(test_hooks), |
| 25 proxy_impl_for_test_(nullptr) {} |
25 | 26 |
26 scoped_ptr<ProxyImpl> ThreadedChannelForTest::CreateProxyImpl( | 27 scoped_ptr<ProxyImpl> ThreadedChannelForTest::CreateProxyImpl( |
27 ChannelImpl* channel_impl, | 28 ChannelImpl* channel_impl, |
28 LayerTreeHost* layer_tree_host, | 29 LayerTreeHost* layer_tree_host, |
29 TaskRunnerProvider* task_runner_provider, | 30 TaskRunnerProvider* task_runner_provider, |
30 scoped_ptr<BeginFrameSource> external_begin_frame_source) { | 31 scoped_ptr<BeginFrameSource> external_begin_frame_source) { |
31 return ProxyImplForTest::Create(test_hooks_, channel_impl, layer_tree_host, | 32 scoped_ptr<ProxyImplForTest> proxy_impl = ProxyImplForTest::Create( |
32 task_runner_provider, | 33 test_hooks_, channel_impl, layer_tree_host, task_runner_provider, |
33 std::move(external_begin_frame_source)); | 34 std::move(external_begin_frame_source)); |
| 35 proxy_impl_for_test_ = proxy_impl.get(); |
| 36 return std::move(proxy_impl); |
34 } | 37 } |
35 | 38 |
36 } // namespace cc | 39 } // namespace cc |
OLD | NEW |