Index: cc/trees/layer_tree_host.cc |
diff --git a/cc/trees/layer_tree_host.cc b/cc/trees/layer_tree_host.cc |
index 74dc211045a01d8f229ce22cd0ab28ab45af6cb1..88186d9a58be94144ba89459bdc96c2a33477ac9 100644 |
--- a/cc/trees/layer_tree_host.cc |
+++ b/cc/trees/layer_tree_host.cc |
@@ -41,8 +41,9 @@ |
#include "cc/trees/layer_tree_host_common.h" |
#include "cc/trees/layer_tree_host_impl.h" |
#include "cc/trees/layer_tree_impl.h" |
+#include "cc/trees/proxy_main.h" |
#include "cc/trees/single_thread_proxy.h" |
-#include "cc/trees/thread_proxy.h" |
+#include "cc/trees/threaded_channel.h" |
#include "cc/trees/tree_synchronizer.h" |
#include "ui/gfx/geometry/size_conversions.h" |
#include "ui/gfx/geometry/vector2d_conversions.h" |
@@ -139,8 +140,12 @@ void LayerTreeHost::InitializeThreaded( |
scoped_ptr<BeginFrameSource> external_begin_frame_source) { |
task_runner_provider_ = |
TaskRunnerProvider::Create(main_task_runner, impl_task_runner); |
- InitializeProxy(ThreadProxy::Create(this, task_runner_provider_.get(), |
- external_begin_frame_source.Pass())); |
+ scoped_ptr<ProxyMain> proxy_main = ProxyMain::Create( |
+ this, task_runner_provider_.get(), external_begin_frame_source.Pass()); |
+ scoped_ptr<ThreadedChannel> threaded_channel = |
+ ThreadedChannel::Create(proxy_main.get(), task_runner_provider_.get()); |
+ proxy_main->SetChannel(threaded_channel.Pass()); |
Wez
2015/11/21 01:00:29
nit: Doesn't look like you need the |threaded_chan
Khushal
2015/11/23 20:07:19
Done.
|
+ InitializeProxy(proxy_main.Pass()); |
} |
void LayerTreeHost::InitializeSingleThreaded( |