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/trace_event/trace_event.h" | 8 #include "base/trace_event/trace_event.h" |
| 9 #include "cc/debug/benchmark_instrumentation.h" | 9 #include "cc/debug/benchmark_instrumentation.h" |
| 10 #include "cc/debug/devtools_instrumentation.h" | 10 #include "cc/debug/devtools_instrumentation.h" |
| (...skipping 514 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 525 DoCommit(); | 525 DoCommit(); |
| 526 | 526 |
| 527 DCHECK_EQ(0u, layer_tree_host_->num_queued_swap_promises()) | 527 DCHECK_EQ(0u, layer_tree_host_->num_queued_swap_promises()) |
| 528 << "Commit should always succeed and transfer promises."; | 528 << "Commit should always succeed and transfer promises."; |
| 529 } | 529 } |
| 530 | 530 |
| 531 { | 531 { |
| 532 DebugScopedSetImplThread impl(const_cast<SingleThreadProxy*>(this)); | 532 DebugScopedSetImplThread impl(const_cast<SingleThreadProxy*>(this)); |
| 533 if (layer_tree_host_impl_->settings().impl_side_painting) { | 533 if (layer_tree_host_impl_->settings().impl_side_painting) { |
| 534 layer_tree_host_impl_->ActivateSyncTree(); | 534 layer_tree_host_impl_->ActivateSyncTree(); |
| 535 layer_tree_host_impl_->active_tree()->UpdateDrawProperties(); | 535 bool update_lcd_text = true; |
|
danakj
2015/02/18 21:51:46
Won't this cause us to check LCD text twice?
enne (OOO)
2015/02/18 22:16:08
Ok, removed.
| |
| 536 layer_tree_host_impl_->active_tree()->UpdateDrawProperties( | |
| 537 update_lcd_text); | |
| 536 layer_tree_host_impl_->PrepareTiles(); | 538 layer_tree_host_impl_->PrepareTiles(); |
| 537 layer_tree_host_impl_->SynchronouslyInitializeAllTiles(); | 539 layer_tree_host_impl_->SynchronouslyInitializeAllTiles(); |
| 538 } | 540 } |
| 539 | 541 |
| 540 DoAnimate(); | 542 DoAnimate(); |
| 541 | 543 |
| 542 LayerTreeHostImpl::FrameData frame; | 544 LayerTreeHostImpl::FrameData frame; |
| 543 DoComposite(frame_begin_time, &frame); | 545 DoComposite(frame_begin_time, &frame); |
| 544 | 546 |
| 545 // DoComposite could abort, but because this is a synchronous composite | 547 // DoComposite could abort, but because this is a synchronous composite |
| (...skipping 284 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 830 | 832 |
| 831 void SingleThreadProxy::DidBeginImplFrameDeadline() { | 833 void SingleThreadProxy::DidBeginImplFrameDeadline() { |
| 832 layer_tree_host_impl_->ResetCurrentBeginFrameArgsForNextFrame(); | 834 layer_tree_host_impl_->ResetCurrentBeginFrameArgsForNextFrame(); |
| 833 } | 835 } |
| 834 | 836 |
| 835 void SingleThreadProxy::SendBeginFramesToChildren(const BeginFrameArgs& args) { | 837 void SingleThreadProxy::SendBeginFramesToChildren(const BeginFrameArgs& args) { |
| 836 layer_tree_host_->SendBeginFramesToChildren(args); | 838 layer_tree_host_->SendBeginFramesToChildren(args); |
| 837 } | 839 } |
| 838 | 840 |
| 839 } // namespace cc | 841 } // namespace cc |
| OLD | NEW |