Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5462)

Unified Diff: cc/test/proxy_main_for_test.cc

Issue 1513643010: cc:: Add remote mode to the compositor (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: cc/test/proxy_main_for_test.cc
diff --git a/cc/test/proxy_main_for_test.cc b/cc/test/proxy_main_for_test.cc
index dcac9a084c4d5e06a3f229fcc26be47f9cb84152..56c9838a85e3d4a51077b0f73652f4008e1b403e 100644
--- a/cc/test/proxy_main_for_test.cc
+++ b/cc/test/proxy_main_for_test.cc
@@ -5,17 +5,32 @@
#include "cc/test/proxy_main_for_test.h"
#include "cc/test/threaded_channel_for_test.h"
+#include "cc/trees/remote_channel_main.h"
namespace cc {
-scoped_ptr<ProxyMain> ProxyMainForTest::CreateThreaded(
+scoped_ptr<ProxyMainForTest> ProxyMainForTest::CreateThreaded(
TestHooks* test_hooks,
LayerTreeHost* host,
TaskRunnerProvider* task_runner_provider) {
- scoped_ptr<ProxyMain> proxy_main(
+ scoped_ptr<ProxyMainForTest> proxy_main(
new ProxyMainForTest(test_hooks, host, task_runner_provider));
- proxy_main->SetChannel(ThreadedChannelForTest::Create(
- test_hooks, proxy_main.get(), task_runner_provider));
+ scoped_ptr<ThreadedChannelForTest> channel = ThreadedChannelForTest::Create(
+ test_hooks, proxy_main.get(), task_runner_provider);
+ proxy_main->threaded_channel_for_test_ = channel.get();
+ proxy_main->SetChannel(std::move(channel));
+ return proxy_main;
+}
+
+scoped_ptr<ProxyMainForTest> ProxyMainForTest::CreateRemote(
+ TestHooks* test_hooks,
+ RemoteProtoChannel* remote_proto_channel,
+ LayerTreeHost* host,
+ TaskRunnerProvider* task_runner_provider) {
+ scoped_ptr<ProxyMainForTest> proxy_main(
+ new ProxyMainForTest(test_hooks, host, task_runner_provider));
+ proxy_main->SetChannel(RemoteChannelMain::Create(
+ remote_proto_channel, proxy_main.get(), task_runner_provider));
return proxy_main;
}
@@ -24,7 +39,9 @@ ProxyMainForTest::~ProxyMainForTest() {}
ProxyMainForTest::ProxyMainForTest(TestHooks* test_hooks,
LayerTreeHost* host,
TaskRunnerProvider* task_runner_provider)
- : ProxyMain(host, task_runner_provider), test_hooks_(test_hooks) {}
+ : ProxyMain(host, task_runner_provider),
+ test_hooks_(test_hooks),
+ threaded_channel_for_test_(nullptr) {}
void ProxyMainForTest::SetNeedsUpdateLayers() {
ProxyMain::SetNeedsUpdateLayers();

Powered by Google App Engine
This is Rietveld 408576698