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

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

Issue 2324273002: Remove external begin frame source parameter and settings (Closed)
Patch Set: Add back comment, remove more febfs includes Created 4 years, 3 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 331 matching lines...) Expand 10 before | Expand all | Expand 10 after
342 bool ProxyMain::BeginMainFrameRequested() const { 342 bool ProxyMain::BeginMainFrameRequested() const {
343 DCHECK(IsMainThread()); 343 DCHECK(IsMainThread());
344 return max_requested_pipeline_stage_ != NO_PIPELINE_STAGE; 344 return max_requested_pipeline_stage_ != NO_PIPELINE_STAGE;
345 } 345 }
346 346
347 void ProxyMain::MainThreadHasStoppedFlinging() { 347 void ProxyMain::MainThreadHasStoppedFlinging() {
348 DCHECK(IsMainThread()); 348 DCHECK(IsMainThread());
349 channel_main_->MainThreadHasStoppedFlingingOnImpl(); 349 channel_main_->MainThreadHasStoppedFlingingOnImpl();
350 } 350 }
351 351
352 void ProxyMain::Start( 352 void ProxyMain::Start() {
353 std::unique_ptr<BeginFrameSource> external_begin_frame_source) {
354 DCHECK(IsMainThread()); 353 DCHECK(IsMainThread());
355 DCHECK(layer_tree_host_->IsThreaded() || layer_tree_host_->IsRemoteServer()); 354 DCHECK(layer_tree_host_->IsThreaded() || layer_tree_host_->IsRemoteServer());
356 DCHECK(channel_main_); 355 DCHECK(channel_main_);
357 DCHECK(!layer_tree_host_->GetSettings().use_external_begin_frame_source ||
358 external_begin_frame_source);
359 356
360 // Create LayerTreeHostImpl. 357 // Create LayerTreeHostImpl.
361 channel_main_->SynchronouslyInitializeImpl( 358 channel_main_->SynchronouslyInitializeImpl(layer_tree_host_);
362 layer_tree_host_, std::move(external_begin_frame_source));
363 359
364 started_ = true; 360 started_ = true;
365 } 361 }
366 362
367 void ProxyMain::Stop() { 363 void ProxyMain::Stop() {
368 TRACE_EVENT0("cc", "ProxyMain::Stop"); 364 TRACE_EVENT0("cc", "ProxyMain::Stop");
369 DCHECK(IsMainThread()); 365 DCHECK(IsMainThread());
370 DCHECK(started_); 366 DCHECK(started_);
371 367
372 channel_main_->SynchronouslyCloseImpl(); 368 channel_main_->SynchronouslyCloseImpl();
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
423 return false; 419 return false;
424 channel_main_->SetNeedsCommitOnImpl(); 420 channel_main_->SetNeedsCommitOnImpl();
425 return true; 421 return true;
426 } 422 }
427 423
428 bool ProxyMain::IsMainThread() const { 424 bool ProxyMain::IsMainThread() const {
429 return task_runner_provider_->IsMainThread(); 425 return task_runner_provider_->IsMainThread();
430 } 426 }
431 427
432 } // namespace cc 428 } // 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