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

Side by Side Diff: cc/test/remote_compositor_test.cc

Issue 2493523003: cc: Remove unused proto conversion code. (Closed)
Patch Set: test Created 4 years, 1 month 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 unified diff | Download patch
« no previous file with comments | « cc/test/remote_compositor_test.h ('k') | cc/test/serialization_test_utils.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/remote_compositor_test.h" 5 #include "cc/test/remote_compositor_test.h"
6 6
7 #include "base/threading/thread_task_runner_handle.h" 7 #include "base/threading/thread_task_runner_handle.h"
8 #include "cc/animation/animation_host.h" 8 #include "cc/animation/animation_host.h"
9 #include "cc/blimp/compositor_proto_state.h" 9 #include "cc/blimp/compositor_proto_state.h"
10 #include "cc/blimp/layer_tree_host_remote.h" 10 #include "cc/blimp/layer_tree_host_remote.h"
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 scoped_refptr<base::SingleThreadTaskRunner> main_task_runner = 53 scoped_refptr<base::SingleThreadTaskRunner> main_task_runner =
54 base::ThreadTaskRunnerHandle::Get(); 54 base::ThreadTaskRunnerHandle::Get();
55 55
56 animation_host_ = AnimationHost::CreateForTesting(ThreadInstance::MAIN); 56 animation_host_ = AnimationHost::CreateForTesting(ThreadInstance::MAIN);
57 57
58 // Engine side setup. 58 // Engine side setup.
59 LayerTreeHostRemote::InitParams params; 59 LayerTreeHostRemote::InitParams params;
60 params.client = &layer_tree_host_client_remote_; 60 params.client = &layer_tree_host_client_remote_;
61 params.main_task_runner = main_task_runner; 61 params.main_task_runner = main_task_runner;
62 params.mutator_host = animation_host_.get(); 62 params.mutator_host = animation_host_.get();
63 params.remote_compositor_bridge = 63 std::unique_ptr<RemoteCompositorBridgeForTest> bridge_for_test =
64 base::MakeUnique<RemoteCompositorBridgeForTest>( 64 base::MakeUnique<RemoteCompositorBridgeForTest>(
65 main_task_runner, 65 main_task_runner,
66 base::Bind(&RemoteCompositorTest::ProcessCompositorStateUpdate, 66 base::Bind(&RemoteCompositorTest::ProcessCompositorStateUpdate,
67 base::Unretained(this))); 67 base::Unretained(this)));
68 fake_remote_compositor_bridge_ = bridge_for_test.get();
69 params.remote_compositor_bridge = std::move(bridge_for_test);
68 params.engine_picture_cache = 70 params.engine_picture_cache =
69 image_serialization_processor_.CreateEnginePictureCache(); 71 image_serialization_processor_.CreateEnginePictureCache();
70 LayerTreeSettings settings; 72 LayerTreeSettings settings;
71 params.settings = &settings; 73 params.settings = &settings;
72 74
73 layer_tree_host_remote_ = base::MakeUnique<LayerTreeHostRemote>(&params); 75 layer_tree_host_remote_ = base::MakeUnique<LayerTreeHostRemote>(&params);
74 76
75 // Client side setup. 77 // Client side setup.
76 layer_tree_host_in_process_ = FakeLayerTreeHost::Create( 78 layer_tree_host_in_process_ = FakeLayerTreeHost::Create(
77 this, &task_graph_runner_, animation_host_.get(), settings, 79 this, &task_graph_runner_, animation_host_.get(), settings,
78 CompositorMode::THREADED); 80 CompositorMode::THREADED);
79 layer_tree_host_in_process_->InitializeForTesting( 81 layer_tree_host_in_process_->InitializeForTesting(
80 TaskRunnerProvider::Create(base::ThreadTaskRunnerHandle::Get(), 82 TaskRunnerProvider::Create(base::ThreadTaskRunnerHandle::Get(),
81 base::ThreadTaskRunnerHandle::Get()), 83 base::ThreadTaskRunnerHandle::Get()),
82 base::MakeUnique<ProxyForCommitRequest>()); 84 base::MakeUnique<ProxyForCommitRequest>());
83 std::unique_ptr<ClientPictureCache> client_picture_cache = 85 std::unique_ptr<ClientPictureCache> client_picture_cache =
84 image_serialization_processor_.CreateClientPictureCache(); 86 image_serialization_processor_.CreateClientPictureCache();
85 compositor_state_deserializer_ = 87 compositor_state_deserializer_ =
86 base::MakeUnique<CompositorStateDeserializer>( 88 base::MakeUnique<CompositorStateDeserializer>(
87 layer_tree_host_in_process_.get(), std::move(client_picture_cache), 89 layer_tree_host_in_process_.get(), std::move(client_picture_cache),
88 this); 90 this);
89 } 91 }
90 92
91 void RemoteCompositorTest::TearDown() { 93 void RemoteCompositorTest::TearDown() {
94 fake_remote_compositor_bridge_ = nullptr;
92 layer_tree_host_remote_ = nullptr; 95 layer_tree_host_remote_ = nullptr;
93 compositor_state_deserializer_ = nullptr; 96 compositor_state_deserializer_ = nullptr;
94 layer_tree_host_in_process_ = nullptr; 97 layer_tree_host_in_process_ = nullptr;
95 animation_host_ = nullptr; 98 animation_host_ = nullptr;
96 } 99 }
97 100
98 // CompositorStateDeserializer implementation. 101 // CompositorStateDeserializer implementation.
99 void RemoteCompositorTest::DidUpdateLocalState() { 102 void RemoteCompositorTest::DidUpdateLocalState() {
100 client_state_dirty_ = true; 103 client_state_dirty_ = true;
101 } 104 }
102 105
103 void RemoteCompositorTest::ApplyViewportDeltas( 106 void RemoteCompositorTest::ApplyViewportDeltas(
104 const gfx::Vector2dF& inner_delta, 107 const gfx::Vector2dF& inner_delta,
105 const gfx::Vector2dF& outer_delta, 108 const gfx::Vector2dF& outer_delta,
106 const gfx::Vector2dF& elastic_overscroll_delta, 109 const gfx::Vector2dF& elastic_overscroll_delta,
107 float page_scale, 110 float page_scale,
108 float top_controls_delta) { 111 float top_controls_delta) {
109 compositor_state_deserializer_->ApplyViewportDeltas( 112 compositor_state_deserializer_->ApplyViewportDeltas(
110 inner_delta, outer_delta, elastic_overscroll_delta, page_scale, 113 inner_delta, outer_delta, elastic_overscroll_delta, page_scale,
111 top_controls_delta); 114 top_controls_delta);
112 } 115 }
113 116
117 bool RemoteCompositorTest::HasPendingUpdate() const {
118 DCHECK(fake_remote_compositor_bridge_);
119 return fake_remote_compositor_bridge_->has_pending_update();
120 }
121
114 void RemoteCompositorTest::ProcessCompositorStateUpdate( 122 void RemoteCompositorTest::ProcessCompositorStateUpdate(
115 std::unique_ptr<CompositorProtoState> compositor_proto_state) { 123 std::unique_ptr<CompositorProtoState> compositor_proto_state) {
116 compositor_state_deserializer_->DeserializeCompositorUpdate( 124 compositor_state_deserializer_->DeserializeCompositorUpdate(
117 compositor_proto_state->compositor_message->layer_tree_host()); 125 compositor_proto_state->compositor_message->layer_tree_host());
118 } 126 }
119 127
120 } // namespace cc 128 } // namespace cc
OLDNEW
« no previous file with comments | « cc/test/remote_compositor_test.h ('k') | cc/test/serialization_test_utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698