| Index: cc/trees/proxy_main.cc
|
| diff --git a/cc/trees/proxy_main.cc b/cc/trees/proxy_main.cc
|
| index dd5ac1afe5e6784188386ddec36905c46af43d1d..ac94309720925d29f2b500bde85df288ad71d838 100644
|
| --- a/cc/trees/proxy_main.cc
|
| +++ b/cc/trees/proxy_main.cc
|
| @@ -16,6 +16,7 @@
|
| #include "cc/output/swap_promise.h"
|
| #include "cc/trees/blocking_task_runner.h"
|
| #include "cc/trees/layer_tree_host.h"
|
| +#include "cc/trees/remote_channel_main.h"
|
| #include "cc/trees/scoped_abort_remaining_swap_promises.h"
|
| #include "cc/trees/threaded_channel.h"
|
|
|
| @@ -33,6 +34,17 @@ scoped_ptr<ProxyMain> ProxyMain::CreateThreaded(
|
| return proxy_main;
|
| }
|
|
|
| +scoped_ptr<ProxyMain> ProxyMain::CreateRemote(
|
| + RemoteProtoChannel* remote_proto_channel,
|
| + LayerTreeHost* layer_tree_host,
|
| + TaskRunnerProvider* task_runner_provider) {
|
| + scoped_ptr<ProxyMain> proxy_main(
|
| + new ProxyMain(layer_tree_host, task_runner_provider, nullptr));
|
| + proxy_main->SetChannel(RemoteChannelMain::Create(
|
| + remote_proto_channel, proxy_main.get(), task_runner_provider));
|
| + return proxy_main;
|
| +}
|
| +
|
| ProxyMain::ProxyMain(LayerTreeHost* layer_tree_host,
|
| TaskRunnerProvider* task_runner_provider,
|
| scoped_ptr<BeginFrameSource> external_begin_frame_source)
|
| @@ -382,7 +394,6 @@ void ProxyMain::MainThreadHasStoppedFlinging() {
|
|
|
| void ProxyMain::Start() {
|
| DCHECK(IsMainThread());
|
| - DCHECK(task_runner_provider_->HasImplThread());
|
| DCHECK(channel_main_);
|
|
|
| // Create LayerTreeHostImpl.
|
|
|