Chromium Code Reviews| 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/single_thread_proxy.h" | 5 #include "cc/trees/single_thread_proxy.h" |
| 6 | 6 |
| 7 #include "base/auto_reset.h" | 7 #include "base/auto_reset.h" |
| 8 #include "base/debug/trace_event.h" | 8 #include "base/debug/trace_event.h" |
| 9 #include "cc/debug/benchmark_instrumentation.h" | 9 #include "cc/debug/benchmark_instrumentation.h" |
| 10 #include "cc/output/context_provider.h" | 10 #include "cc/output/context_provider.h" |
| (...skipping 322 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 333 TRACE_EVENT0("cc", "SingleThreadProxy::DidSwapBuffersCompleteOnImplThread"); | 333 TRACE_EVENT0("cc", "SingleThreadProxy::DidSwapBuffersCompleteOnImplThread"); |
| 334 client_->DidCompleteSwapBuffers(); | 334 client_->DidCompleteSwapBuffers(); |
| 335 } | 335 } |
| 336 | 336 |
| 337 // Called by the legacy scheduling path (e.g. where render_widget does the | 337 // Called by the legacy scheduling path (e.g. where render_widget does the |
| 338 // scheduling) | 338 // scheduling) |
| 339 void SingleThreadProxy::CompositeImmediately(base::TimeTicks frame_begin_time) { | 339 void SingleThreadProxy::CompositeImmediately(base::TimeTicks frame_begin_time) { |
| 340 TRACE_EVENT0("cc", "SingleThreadProxy::CompositeImmediately"); | 340 TRACE_EVENT0("cc", "SingleThreadProxy::CompositeImmediately"); |
| 341 DCHECK(Proxy::IsMainThread()); | 341 DCHECK(Proxy::IsMainThread()); |
| 342 | 342 |
| 343 if (!layer_tree_host_->InitializeOutputSurfaceIfNeeded()) | |
|
enne (OOO)
2014/05/16 20:50:14
Should this now DCHECK that the output surface is
danakj
2014/05/16 21:02:14
sure.
| |
| 344 return; | |
| 345 | |
| 346 layer_tree_host_->AnimateLayers(frame_begin_time); | 343 layer_tree_host_->AnimateLayers(frame_begin_time); |
| 347 | 344 |
| 348 if (PrioritizedResourceManager* contents_texture_manager = | 345 if (PrioritizedResourceManager* contents_texture_manager = |
| 349 layer_tree_host_->contents_texture_manager()) { | 346 layer_tree_host_->contents_texture_manager()) { |
| 350 contents_texture_manager->UnlinkAndClearEvictedBackings(); | 347 contents_texture_manager->UnlinkAndClearEvictedBackings(); |
| 351 contents_texture_manager->SetMaxMemoryLimitBytes( | 348 contents_texture_manager->SetMaxMemoryLimitBytes( |
| 352 layer_tree_host_impl_->memory_allocation_limit_bytes()); | 349 layer_tree_host_impl_->memory_allocation_limit_bytes()); |
| 353 contents_texture_manager->SetExternalPriorityCutoff( | 350 contents_texture_manager->SetExternalPriorityCutoff( |
| 354 layer_tree_host_impl_->memory_allocation_priority_cutoff()); | 351 layer_tree_host_impl_->memory_allocation_priority_cutoff()); |
| 355 } | 352 } |
| (...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 466 void SingleThreadProxy::DidSwapFrame() { | 463 void SingleThreadProxy::DidSwapFrame() { |
| 467 if (next_frame_is_newly_committed_frame_) { | 464 if (next_frame_is_newly_committed_frame_) { |
| 468 next_frame_is_newly_committed_frame_ = false; | 465 next_frame_is_newly_committed_frame_ = false; |
| 469 layer_tree_host_->DidCommitAndDrawFrame(); | 466 layer_tree_host_->DidCommitAndDrawFrame(); |
| 470 } | 467 } |
| 471 } | 468 } |
| 472 | 469 |
| 473 bool SingleThreadProxy::CommitPendingForTesting() { return false; } | 470 bool SingleThreadProxy::CommitPendingForTesting() { return false; } |
| 474 | 471 |
| 475 } // namespace cc | 472 } // namespace cc |
| OLD | NEW |