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

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

Issue 2003103002: cc: Fix overwriting of commit completion event in MFBA mode. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2743
Patch Set: Created 4 years, 7 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 unified diff | Download patch
« no previous file with comments | « cc/test/proxy_impl_for_test.h ('k') | cc/trees/layer_tree_host_unittest_proxy.cc » ('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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/proxy_impl_for_test.h" 5 #include "cc/test/proxy_impl_for_test.h"
6 6
7 #include "base/memory/ptr_util.h" 7 #include "base/memory/ptr_util.h"
8 8
9 namespace cc { 9 namespace cc {
10 std::unique_ptr<ProxyImplForTest> ProxyImplForTest::Create( 10 std::unique_ptr<ProxyImplForTest> ProxyImplForTest::Create(
11 TestHooks* test_hooks, 11 TestHooks* test_hooks,
12 ChannelImpl* channel_impl, 12 ChannelImpl* channel_impl,
13 LayerTreeHost* layer_tree_host, 13 LayerTreeHost* layer_tree_host,
14 TaskRunnerProvider* task_runner_provider, 14 TaskRunnerProvider* task_runner_provider,
15 std::unique_ptr<BeginFrameSource> external_begin_frame_source) { 15 std::unique_ptr<BeginFrameSource> external_begin_frame_source) {
16 return base::WrapUnique(new ProxyImplForTest( 16 return base::WrapUnique(new ProxyImplForTest(
17 test_hooks, channel_impl, layer_tree_host, task_runner_provider, 17 test_hooks, channel_impl, layer_tree_host, task_runner_provider,
18 std::move(external_begin_frame_source))); 18 std::move(external_begin_frame_source)));
19 } 19 }
20 20
21 bool ProxyImplForTest::HasCommitCompletionEvent() const {
22 return commit_completion_event_ != nullptr;
23 }
24
25 bool ProxyImplForTest::GetNextCommitWaitsForActivation() const {
26 return next_commit_waits_for_activation_;
27 }
28
29 ProxyImplForTest::ProxyImplForTest( 21 ProxyImplForTest::ProxyImplForTest(
30 TestHooks* test_hooks, 22 TestHooks* test_hooks,
31 ChannelImpl* channel_impl, 23 ChannelImpl* channel_impl,
32 LayerTreeHost* layer_tree_host, 24 LayerTreeHost* layer_tree_host,
33 TaskRunnerProvider* task_runner_provider, 25 TaskRunnerProvider* task_runner_provider,
34 std::unique_ptr<BeginFrameSource> external_begin_frame_source) 26 std::unique_ptr<BeginFrameSource> external_begin_frame_source)
35 : ProxyImpl(channel_impl, 27 : ProxyImpl(channel_impl,
36 layer_tree_host, 28 layer_tree_host,
37 task_runner_provider, 29 task_runner_provider,
38 std::move(external_begin_frame_source)), 30 std::move(external_begin_frame_source)),
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 LayerTreeHost* layer_tree_host, 143 LayerTreeHost* layer_tree_host,
152 base::TimeTicks main_thread_start_time, 144 base::TimeTicks main_thread_start_time,
153 bool hold_commit_for_activation) { 145 bool hold_commit_for_activation) {
154 test_hooks_->StartCommitOnImpl(); 146 test_hooks_->StartCommitOnImpl();
155 ProxyImpl::StartCommitOnImpl(completion, layer_tree_host, 147 ProxyImpl::StartCommitOnImpl(completion, layer_tree_host,
156 main_thread_start_time, 148 main_thread_start_time,
157 hold_commit_for_activation); 149 hold_commit_for_activation);
158 } 150 }
159 151
160 } // namespace cc 152 } // namespace cc
OLDNEW
« no previous file with comments | « cc/test/proxy_impl_for_test.h ('k') | cc/trees/layer_tree_host_unittest_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698