Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(108)

Unified Diff: cc/trees/thread_proxy.cc

Issue 22926024: cc: Control activation from the Scheduler (Closed) Base URL: http://git.chromium.org/chromium/src.git@schedOutputSurface4
Patch Set: Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« cc/scheduler/scheduler_state_machine.cc ('K') | « cc/trees/thread_proxy.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/thread_proxy.cc
diff --git a/cc/trees/thread_proxy.cc b/cc/trees/thread_proxy.cc
index 955ce252eb1101dae960a4d23260bcdbbc305200..c717608aa666b1be1ff266ecb50a35bd5442cc97 100644
--- a/cc/trees/thread_proxy.cc
+++ b/cc/trees/thread_proxy.cc
@@ -410,11 +410,20 @@ void ThreadProxy::OnCanDrawStateChanged(bool can_draw) {
!scheduler_on_impl_thread_->WillDrawIfNeeded());
}
+void ThreadProxy::NotifyReadyToActivate() {
+ TRACE_EVENT0("cc", "ThreadProxy::NotifyReadyToActivate");
+ scheduler_on_impl_thread_->NotifyReadyToActivate();
+}
+
void ThreadProxy::OnHasPendingTreeStateChanged(bool has_pending_tree) {
DCHECK(IsImplThread());
TRACE_EVENT1("cc", "ThreadProxy::OnHasPendingTreeStateChanged",
"has_pending_tree", has_pending_tree);
- scheduler_on_impl_thread_->SetHasPendingTree(has_pending_tree);
+ scheduler_on_impl_thread_->SetHasTrees(
+ has_pending_tree,
+ layer_tree_host_impl_->active_tree()
+ ? !layer_tree_host_impl_->active_tree()->root_layer()
+ : true);
}
void ThreadProxy::SetNeedsCommitOnImplThread() {
@@ -966,10 +975,10 @@ void ThreadProxy::ScheduledActionUpdateVisibleTiles() {
layer_tree_host_impl_->UpdateVisibleTiles();
}
-void ThreadProxy::ScheduledActionActivatePendingTreeIfNeeded() {
+void ThreadProxy::ScheduledActionActivatePendingTree() {
DCHECK(IsImplThread());
- TRACE_EVENT0("cc", "ThreadProxy::ScheduledActionActivatePendingTreeIfNeeded");
- layer_tree_host_impl_->ActivatePendingTreeIfNeeded();
+ TRACE_EVENT0("cc", "ThreadProxy::ScheduledActionActivatePendingTree");
+ layer_tree_host_impl_->ActivatePendingTree();
}
void ThreadProxy::ScheduledActionBeginOutputSurfaceCreation() {
« cc/scheduler/scheduler_state_machine.cc ('K') | « cc/trees/thread_proxy.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698