| 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 457 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 468 } | 468 } |
| 469 | 469 |
| 470 void LayerTreeHost::CommitComplete() { | 470 void LayerTreeHost::CommitComplete() { |
| 471 client_->DidCommit(); | 471 client_->DidCommit(); |
| 472 } | 472 } |
| 473 | 473 |
| 474 scoped_ptr<OutputSurface> LayerTreeHost::CreateOutputSurface() { | 474 scoped_ptr<OutputSurface> LayerTreeHost::CreateOutputSurface() { |
| 475 return client_->CreateOutputSurface(); | 475 return client_->CreateOutputSurface(); |
| 476 } | 476 } |
| 477 | 477 |
| 478 scoped_ptr<InputHandlerClient> LayerTreeHost::CreateInputHandlerClient() { | |
| 479 return client_->CreateInputHandlerClient(); | |
| 480 } | |
| 481 | |
| 482 scoped_ptr<LayerTreeHostImpl> LayerTreeHost::CreateLayerTreeHostImpl( | 478 scoped_ptr<LayerTreeHostImpl> LayerTreeHost::CreateLayerTreeHostImpl( |
| 483 LayerTreeHostImplClient* client) { | 479 LayerTreeHostImplClient* client) { |
| 484 DCHECK(proxy_->IsImplThread()); | 480 DCHECK(proxy_->IsImplThread()); |
| 485 scoped_ptr<LayerTreeHostImpl> host_impl = | 481 scoped_ptr<LayerTreeHostImpl> host_impl = |
| 486 LayerTreeHostImpl::Create(settings_, | 482 LayerTreeHostImpl::Create(settings_, |
| 487 client, | 483 client, |
| 488 proxy_.get(), | 484 proxy_.get(), |
| 489 rendering_stats_instrumentation_.get()); | 485 rendering_stats_instrumentation_.get()); |
| 490 if (settings_.calculate_top_controls_position && | 486 if (settings_.calculate_top_controls_position && |
| 491 host_impl->top_controls_manager()) { | 487 host_impl->top_controls_manager()) { |
| 492 top_controls_manager_weak_ptr_ = | 488 top_controls_manager_weak_ptr_ = |
| 493 host_impl->top_controls_manager()->AsWeakPtr(); | 489 host_impl->top_controls_manager()->AsWeakPtr(); |
| 494 } | 490 } |
| 491 input_handler_weak_ptr_ = host_impl->AsWeakPtr(); |
| 495 return host_impl.Pass(); | 492 return host_impl.Pass(); |
| 496 } | 493 } |
| 497 | 494 |
| 498 void LayerTreeHost::DidLoseOutputSurface() { | 495 void LayerTreeHost::DidLoseOutputSurface() { |
| 499 TRACE_EVENT0("cc", "LayerTreeHost::DidLoseOutputSurface"); | 496 TRACE_EVENT0("cc", "LayerTreeHost::DidLoseOutputSurface"); |
| 500 DCHECK(proxy_->IsMainThread()); | 497 DCHECK(proxy_->IsMainThread()); |
| 501 | 498 |
| 502 if (output_surface_lost_) | 499 if (output_surface_lost_) |
| 503 return; | 500 return; |
| 504 | 501 |
| (...skipping 591 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1096 bool start_ready_animations = true; | 1093 bool start_ready_animations = true; |
| 1097 (*iter).second->UpdateState(start_ready_animations, NULL); | 1094 (*iter).second->UpdateState(start_ready_animations, NULL); |
| 1098 } | 1095 } |
| 1099 } | 1096 } |
| 1100 | 1097 |
| 1101 skia::RefPtr<SkPicture> LayerTreeHost::CapturePicture() { | 1098 skia::RefPtr<SkPicture> LayerTreeHost::CapturePicture() { |
| 1102 return proxy_->CapturePicture(); | 1099 return proxy_->CapturePicture(); |
| 1103 } | 1100 } |
| 1104 | 1101 |
| 1105 } // namespace cc | 1102 } // namespace cc |
| OLD | NEW |