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

Side by Side Diff: cc/trees/proxy_impl.cc

Issue 2833603002: Revert of Plumb activation time to main (Closed)
Patch Set: Created 3 years, 8 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 unified diff | Download patch
« no previous file with comments | « cc/trees/layer_tree_host_unittest_proxy.cc ('k') | cc/trees/proxy_main.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/proxy_impl.h" 5 #include "cc/trees/proxy_impl.h"
6 6
7 #include <string.h> 7 #include <string.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <string> 10 #include <string>
(...skipping 308 matching lines...) Expand 10 before | Expand all | Expand 10 after
319 319
320 void ProxyImpl::OnCanDrawStateChanged(bool can_draw) { 320 void ProxyImpl::OnCanDrawStateChanged(bool can_draw) {
321 TRACE_EVENT1("cc", "ProxyImpl::OnCanDrawStateChanged", "can_draw", can_draw); 321 TRACE_EVENT1("cc", "ProxyImpl::OnCanDrawStateChanged", "can_draw", can_draw);
322 DCHECK(IsImplThread()); 322 DCHECK(IsImplThread());
323 scheduler_->SetCanDraw(can_draw); 323 scheduler_->SetCanDraw(can_draw);
324 } 324 }
325 325
326 void ProxyImpl::NotifyReadyToActivate() { 326 void ProxyImpl::NotifyReadyToActivate() {
327 TRACE_EVENT0("cc", "ProxyImpl::NotifyReadyToActivate"); 327 TRACE_EVENT0("cc", "ProxyImpl::NotifyReadyToActivate");
328 DCHECK(IsImplThread()); 328 DCHECK(IsImplThread());
329 scheduler_->NotifyReadyToActivate( 329 scheduler_->NotifyReadyToActivate();
330 layer_tree_host_impl_->pending_tree()
331 ? layer_tree_host_impl_->pending_tree()->source_frame_number()
332 : -1);
333 } 330 }
334 331
335 void ProxyImpl::NotifyReadyToDraw() { 332 void ProxyImpl::NotifyReadyToDraw() {
336 TRACE_EVENT0("cc", "ProxyImpl::NotifyReadyToDraw"); 333 TRACE_EVENT0("cc", "ProxyImpl::NotifyReadyToDraw");
337 DCHECK(IsImplThread()); 334 DCHECK(IsImplThread());
338 scheduler_->NotifyReadyToDraw(); 335 scheduler_->NotifyReadyToDraw();
339 } 336 }
340 337
341 void ProxyImpl::SetNeedsRedrawOnImplThread() { 338 void ProxyImpl::SetNeedsRedrawOnImplThread() {
342 TRACE_EVENT0("cc", "ProxyImpl::SetNeedsRedrawOnImplThread"); 339 TRACE_EVENT0("cc", "ProxyImpl::SetNeedsRedrawOnImplThread");
(...skipping 343 matching lines...) Expand 10 before | Expand all | Expand 10 after
686 ProxyImpl::BlockedMainCommitOnly& ProxyImpl::blocked_main_commit() { 683 ProxyImpl::BlockedMainCommitOnly& ProxyImpl::blocked_main_commit() {
687 DCHECK(IsMainThreadBlocked() && commit_completion_event_); 684 DCHECK(IsMainThreadBlocked() && commit_completion_event_);
688 return main_thread_blocked_commit_vars_unsafe_; 685 return main_thread_blocked_commit_vars_unsafe_;
689 } 686 }
690 687
691 base::SingleThreadTaskRunner* ProxyImpl::MainThreadTaskRunner() { 688 base::SingleThreadTaskRunner* ProxyImpl::MainThreadTaskRunner() {
692 return task_runner_provider_->MainThreadTaskRunner(); 689 return task_runner_provider_->MainThreadTaskRunner();
693 } 690 }
694 691
695 } // namespace cc 692 } // namespace cc
OLDNEW
« no previous file with comments | « cc/trees/layer_tree_host_unittest_proxy.cc ('k') | cc/trees/proxy_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698