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

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

Issue 1101823002: CC Animations: Make LayerAnimationController creation optional (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Plumb LayerSettings parameter for cc::Layer construction. Created 5 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
OLDNEW
1 // Copyright 2011 The Chromium Authors. All rights reserved. 1 // Copyright 2011 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/layer_tree_host.h" 5 #include "cc/trees/layer_tree_host.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <stack> 8 #include <stack>
9 #include <string> 9 #include <string>
10 10
(...skipping 364 matching lines...) Expand 10 before | Expand all | Expand 10 after
375 micro_benchmark_controller_.ScheduleImplBenchmarks(host_impl); 375 micro_benchmark_controller_.ScheduleImplBenchmarks(host_impl);
376 } 376 }
377 377
378 void LayerTreeHost::WillCommit() { 378 void LayerTreeHost::WillCommit() {
379 client_->WillCommit(); 379 client_->WillCommit();
380 } 380 }
381 381
382 void LayerTreeHost::UpdateHudLayer() { 382 void LayerTreeHost::UpdateHudLayer() {
383 if (debug_state_.ShowHudInfo()) { 383 if (debug_state_.ShowHudInfo()) {
384 if (!hud_layer_.get()) 384 if (!hud_layer_.get())
385 hud_layer_ = HeadsUpDisplayLayer::Create(); 385 hud_layer_ = HeadsUpDisplayLayer::Create(settings_.hud_layer_settings_);
386 386
387 if (root_layer_.get() && !hud_layer_->parent()) 387 if (root_layer_.get() && !hud_layer_->parent())
388 root_layer_->AddChild(hud_layer_); 388 root_layer_->AddChild(hud_layer_);
389 } else if (hud_layer_.get()) { 389 } else if (hud_layer_.get()) {
390 hud_layer_->RemoveFromParent(); 390 hud_layer_->RemoveFromParent();
391 hud_layer_ = NULL; 391 hud_layer_ = NULL;
392 } 392 }
393 } 393 }
394 394
395 void LayerTreeHost::CommitComplete() { 395 void LayerTreeHost::CommitComplete() {
(...skipping 889 matching lines...) Expand 10 before | Expand all | Expand 10 after
1285 const BeginFrameArgs& args) const { 1285 const BeginFrameArgs& args) const {
1286 client_->SendBeginFramesToChildren(args); 1286 client_->SendBeginFramesToChildren(args);
1287 } 1287 }
1288 1288
1289 void LayerTreeHost::SetAuthoritativeVSyncInterval( 1289 void LayerTreeHost::SetAuthoritativeVSyncInterval(
1290 const base::TimeDelta& interval) { 1290 const base::TimeDelta& interval) {
1291 proxy_->SetAuthoritativeVSyncInterval(interval); 1291 proxy_->SetAuthoritativeVSyncInterval(interval);
1292 } 1292 }
1293 1293
1294 } // namespace cc 1294 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698