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

Side by Side Diff: cc/trees/proxy_main.cc

Issue 2231093003: cc: Remove FinishAllRendering, as it doesn't do anything anymore. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: finishallrendering: . Created 4 years, 4 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/trees/proxy_main.h ('k') | cc/trees/remote_channel_impl.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 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/trees/proxy_main.h" 5 #include "cc/trees/proxy_main.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 9
10 #include "base/trace_event/trace_event.h" 10 #include "base/trace_event/trace_event.h"
(...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after
253 begin_main_frame_start_time, 253 begin_main_frame_start_time,
254 hold_commit_for_activation); 254 hold_commit_for_activation);
255 completion.Wait(); 255 completion.Wait();
256 } 256 }
257 257
258 current_pipeline_stage_ = NO_PIPELINE_STAGE; 258 current_pipeline_stage_ = NO_PIPELINE_STAGE;
259 layer_tree_host_->CommitComplete(); 259 layer_tree_host_->CommitComplete();
260 layer_tree_host_->DidBeginMainFrame(); 260 layer_tree_host_->DidBeginMainFrame();
261 } 261 }
262 262
263 void ProxyMain::FinishAllRendering() {
264 DCHECK(IsMainThread());
265 DCHECK(!defer_commits_);
266
267 // Make sure all GL drawing is finished on the impl thread.
268 DebugScopedSetMainThreadBlocked main_thread_blocked(task_runner_provider_);
269 CompletionEvent completion;
270 channel_main_->FinishAllRenderingOnImpl(&completion);
271 completion.Wait();
272 }
273
274 bool ProxyMain::IsStarted() const { 263 bool ProxyMain::IsStarted() const {
275 DCHECK(IsMainThread()); 264 DCHECK(IsMainThread());
276 return started_; 265 return started_;
277 } 266 }
278 267
279 bool ProxyMain::CommitToActiveTree() const { 268 bool ProxyMain::CommitToActiveTree() const {
280 // With ProxyMain, we use a pending tree and activate it once it's ready to 269 // With ProxyMain, we use a pending tree and activate it once it's ready to
281 // draw to allow input to modify the active tree and draw during raster. 270 // draw to allow input to modify the active tree and draw during raster.
282 return false; 271 return false;
283 } 272 }
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
459 return false; 448 return false;
460 channel_main_->SetNeedsCommitOnImpl(); 449 channel_main_->SetNeedsCommitOnImpl();
461 return true; 450 return true;
462 } 451 }
463 452
464 bool ProxyMain::IsMainThread() const { 453 bool ProxyMain::IsMainThread() const {
465 return task_runner_provider_->IsMainThread(); 454 return task_runner_provider_->IsMainThread();
466 } 455 }
467 456
468 } // namespace cc 457 } // namespace cc
OLDNEW
« no previous file with comments | « cc/trees/proxy_main.h ('k') | cc/trees/remote_channel_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698