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

Unified Diff: cc/layers/layer_unittest.cc

Issue 2650303002: cc: Remove the LayerTreeHost abstraction. (Closed)
Patch Set: missed ui Created 3 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
« no previous file with comments | « cc/BUILD.gn ('k') | cc/layers/picture_layer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/layer_unittest.cc
diff --git a/cc/layers/layer_unittest.cc b/cc/layers/layer_unittest.cc
index d47561b0e190d6d53d3033aca98828f6b80b320d..28689cbd681bbbe656c0ad595bfda75fcfd98eae 100644
--- a/cc/layers/layer_unittest.cc
+++ b/cc/layers/layer_unittest.cc
@@ -86,7 +86,7 @@ namespace {
class MockLayerTree : public LayerTree {
public:
- MockLayerTree(LayerTreeHostInProcess::InitParams* params,
+ MockLayerTree(LayerTreeHost::InitParams* params,
LayerTreeHost* layer_tree_host)
: LayerTree(params->mutator_host, layer_tree_host) {}
~MockLayerTree() override {}
@@ -94,11 +94,11 @@ class MockLayerTree : public LayerTree {
MOCK_METHOD0(SetNeedsFullTreeSync, void());
};
-class MockLayerTreeHost : public LayerTreeHostInProcess {
+class MockLayerTreeHost : public LayerTreeHost {
public:
MockLayerTreeHost(LayerTreeHostSingleThreadClient* single_thread_client,
- LayerTreeHostInProcess::InitParams* params)
- : LayerTreeHostInProcess(
+ LayerTreeHost::InitParams* params)
+ : LayerTreeHost(
params,
CompositorMode::SINGLE_THREADED,
base::MakeUnique<StrictMock<MockLayerTree>>(params, this)) {
@@ -129,7 +129,7 @@ class LayerTest : public testing::Test {
void SetUp() override {
animation_host_ = AnimationHost::CreateForTesting(ThreadInstance::MAIN);
- LayerTreeHostInProcess::InitParams params;
+ LayerTreeHost::InitParams params;
params.client = &fake_client_;
params.settings = &settings_;
params.task_graph_runner = &task_graph_runner_;
@@ -1039,15 +1039,14 @@ class LayerTreeHostFactory {
std::unique_ptr<LayerTreeHost> Create(LayerTreeSettings settings,
MutatorHost* mutator_host) {
- LayerTreeHostInProcess::InitParams params;
+ LayerTreeHost::InitParams params;
params.client = &client_;
params.task_graph_runner = &task_graph_runner_;
params.settings = &settings;
params.main_task_runner = base::ThreadTaskRunnerHandle::Get();
params.mutator_host = mutator_host;
- return LayerTreeHostInProcess::CreateSingleThreaded(&single_thread_client_,
- &params);
+ return LayerTreeHost::CreateSingleThreaded(&single_thread_client_, &params);
}
private:
« no previous file with comments | « cc/BUILD.gn ('k') | cc/layers/picture_layer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698