| 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 210 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 221 layer_tree_host_impl_->resource_provider()); | 221 layer_tree_host_impl_->resource_provider()); |
| 222 update_controller->Finalize(); | 222 update_controller->Finalize(); |
| 223 | 223 |
| 224 if (layer_tree_host_impl_->EvictedUIResourcesExist()) | 224 if (layer_tree_host_impl_->EvictedUIResourcesExist()) |
| 225 layer_tree_host_->RecreateUIResources(); | 225 layer_tree_host_->RecreateUIResources(); |
| 226 | 226 |
| 227 layer_tree_host_->FinishCommitOnImplThread(layer_tree_host_impl_.get()); | 227 layer_tree_host_->FinishCommitOnImplThread(layer_tree_host_impl_.get()); |
| 228 | 228 |
| 229 layer_tree_host_impl_->CommitComplete(); | 229 layer_tree_host_impl_->CommitComplete(); |
| 230 | 230 |
| 231 #if DCHECK_IS_ON | 231 #if !DCHECK_IS_OFF |
| 232 // In the single-threaded case, the scale and scroll deltas should never be | 232 // In the single-threaded case, the scale and scroll deltas should never be |
| 233 // touched on the impl layer tree. | 233 // touched on the impl layer tree. |
| 234 scoped_ptr<ScrollAndScaleSet> scroll_info = | 234 scoped_ptr<ScrollAndScaleSet> scroll_info = |
| 235 layer_tree_host_impl_->ProcessScrollDeltas(); | 235 layer_tree_host_impl_->ProcessScrollDeltas(); |
| 236 DCHECK(!scroll_info->scrolls.size()); | 236 DCHECK(!scroll_info->scrolls.size()); |
| 237 DCHECK_EQ(1.f, scroll_info->page_scale_delta); | 237 DCHECK_EQ(1.f, scroll_info->page_scale_delta); |
| 238 #endif | 238 #endif |
| 239 } | 239 } |
| 240 | 240 |
| 241 if (layer_tree_host_->settings().impl_side_painting) { | 241 if (layer_tree_host_->settings().impl_side_painting) { |
| (...skipping 556 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 798 | 798 |
| 799 void SingleThreadProxy::DidBeginImplFrameDeadline() { | 799 void SingleThreadProxy::DidBeginImplFrameDeadline() { |
| 800 layer_tree_host_impl_->ResetCurrentBeginFrameArgsForNextFrame(); | 800 layer_tree_host_impl_->ResetCurrentBeginFrameArgsForNextFrame(); |
| 801 } | 801 } |
| 802 | 802 |
| 803 void SingleThreadProxy::SendBeginFramesToChildren(const BeginFrameArgs& args) { | 803 void SingleThreadProxy::SendBeginFramesToChildren(const BeginFrameArgs& args) { |
| 804 layer_tree_host_->SendBeginFramesToChildren(args); | 804 layer_tree_host_->SendBeginFramesToChildren(args); |
| 805 } | 805 } |
| 806 | 806 |
| 807 } // namespace cc | 807 } // namespace cc |
| OLD | NEW |