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/thread_proxy.h" | 5 #include "cc/trees/thread_proxy.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/auto_reset.h" | 9 #include "base/auto_reset.h" |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 783 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
794 | 794 |
795 layer_tree_host_->contents_texture_manager()-> | 795 layer_tree_host_->contents_texture_manager()-> |
796 PushTexturePrioritiesToBackings(); | 796 PushTexturePrioritiesToBackings(); |
797 } | 797 } |
798 | 798 |
799 commit_completion_event_on_impl_thread_ = completion; | 799 commit_completion_event_on_impl_thread_ = completion; |
800 if (layer_tree_host_impl_->resource_provider()) { | 800 if (layer_tree_host_impl_->resource_provider()) { |
801 current_resource_update_controller_on_impl_thread_ = | 801 current_resource_update_controller_on_impl_thread_ = |
802 ResourceUpdateController::Create( | 802 ResourceUpdateController::Create( |
803 this, | 803 this, |
804 Proxy::ImplThread(), | 804 Proxy::ImplThread()->TaskRunner(), |
805 queue.Pass(), | 805 queue.Pass(), |
806 layer_tree_host_impl_->resource_provider()); | 806 layer_tree_host_impl_->resource_provider()); |
807 current_resource_update_controller_on_impl_thread_->PerformMoreUpdates( | 807 current_resource_update_controller_on_impl_thread_->PerformMoreUpdates( |
808 scheduler_on_impl_thread_->AnticipatedDrawTime()); | 808 scheduler_on_impl_thread_->AnticipatedDrawTime()); |
809 } else { | 809 } else { |
810 // Normally the ResourceUpdateController notifies when commit should | 810 // Normally the ResourceUpdateController notifies when commit should |
811 // finish, but in tile-free software rendering there is no resource | 811 // finish, but in tile-free software rendering there is no resource |
812 // update step so jump straight to the notification. | 812 // update step so jump straight to the notification. |
813 scheduler_on_impl_thread_->FinishCommit(); | 813 scheduler_on_impl_thread_->FinishCommit(); |
814 } | 814 } |
(...skipping 600 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1415 !layer_tree_host_impl_->pending_tree()) { | 1415 !layer_tree_host_impl_->pending_tree()) { |
1416 TRACE_EVENT_INSTANT0("cc", "ReleaseCommitbyActivation", | 1416 TRACE_EVENT_INSTANT0("cc", "ReleaseCommitbyActivation", |
1417 TRACE_EVENT_SCOPE_THREAD); | 1417 TRACE_EVENT_SCOPE_THREAD); |
1418 DCHECK(layer_tree_host_impl_->settings().impl_side_painting); | 1418 DCHECK(layer_tree_host_impl_->settings().impl_side_painting); |
1419 completion_event_for_commit_held_on_tree_activation_->Signal(); | 1419 completion_event_for_commit_held_on_tree_activation_->Signal(); |
1420 completion_event_for_commit_held_on_tree_activation_ = NULL; | 1420 completion_event_for_commit_held_on_tree_activation_ = NULL; |
1421 } | 1421 } |
1422 } | 1422 } |
1423 | 1423 |
1424 } // namespace cc | 1424 } // namespace cc |
OLD | NEW |