| OLD | NEW |
| 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 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 374 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 385 hud_layer_->RemoveFromParent(); | 385 hud_layer_->RemoveFromParent(); |
| 386 hud_layer_ = NULL; | 386 hud_layer_ = NULL; |
| 387 } | 387 } |
| 388 } | 388 } |
| 389 | 389 |
| 390 void LayerTreeHost::CommitComplete() { | 390 void LayerTreeHost::CommitComplete() { |
| 391 client_->DidCommit(); | 391 client_->DidCommit(); |
| 392 } | 392 } |
| 393 | 393 |
| 394 scoped_ptr<OutputSurface> LayerTreeHost::CreateOutputSurface() { | 394 scoped_ptr<OutputSurface> LayerTreeHost::CreateOutputSurface() { |
| 395 return client_->CreateOutputSurface(); | 395 return client_->CreateOutputSurface(num_failed_recreate_attempts_ >= 4); |
| 396 } | 396 } |
| 397 | 397 |
| 398 scoped_ptr<LayerTreeHostImpl> LayerTreeHost::CreateLayerTreeHostImpl( | 398 scoped_ptr<LayerTreeHostImpl> LayerTreeHost::CreateLayerTreeHostImpl( |
| 399 LayerTreeHostImplClient* client) { | 399 LayerTreeHostImplClient* client) { |
| 400 DCHECK(proxy_->IsImplThread()); | 400 DCHECK(proxy_->IsImplThread()); |
| 401 scoped_ptr<LayerTreeHostImpl> host_impl = | 401 scoped_ptr<LayerTreeHostImpl> host_impl = |
| 402 LayerTreeHostImpl::Create(settings_, | 402 LayerTreeHostImpl::Create(settings_, |
| 403 client, | 403 client, |
| 404 proxy_.get(), | 404 proxy_.get(), |
| 405 rendering_stats_instrumentation_.get()); | 405 rendering_stats_instrumentation_.get()); |
| (...skipping 694 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1100 for (AnimationRegistrar::AnimationControllerMap::iterator iter = copy.begin(); | 1100 for (AnimationRegistrar::AnimationControllerMap::iterator iter = copy.begin(); |
| 1101 iter != copy.end(); | 1101 iter != copy.end(); |
| 1102 ++iter) { | 1102 ++iter) { |
| 1103 (*iter).second->Animate(monotonic_time); | 1103 (*iter).second->Animate(monotonic_time); |
| 1104 bool start_ready_animations = true; | 1104 bool start_ready_animations = true; |
| 1105 (*iter).second->UpdateState(start_ready_animations, NULL); | 1105 (*iter).second->UpdateState(start_ready_animations, NULL); |
| 1106 } | 1106 } |
| 1107 } | 1107 } |
| 1108 | 1108 |
| 1109 } // namespace cc | 1109 } // namespace cc |
| OLD | NEW |