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

Side by Side Diff: cc/scheduler/scheduler.cc

Issue 1415763008: cc: Remove ThreadProxy dependency on LTHI::CurrentBeginFrameArgs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@CompositorTimingHistory2
Patch Set: 80 chars Created 5 years, 1 month 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/scheduler/scheduler.h ('k') | cc/scheduler/scheduler_unittest.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 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/scheduler/scheduler.h" 5 #include "cc/scheduler/scheduler.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/auto_reset.h" 9 #include "base/auto_reset.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 637 matching lines...) Expand 10 before | Expand all | Expand 10 after
648 break; 648 break;
649 case SchedulerStateMachine::ACTION_ANIMATE: 649 case SchedulerStateMachine::ACTION_ANIMATE:
650 state_machine_.WillAnimate(); 650 state_machine_.WillAnimate();
651 client_->ScheduledActionAnimate(); 651 client_->ScheduledActionAnimate();
652 break; 652 break;
653 case SchedulerStateMachine::ACTION_SEND_BEGIN_MAIN_FRAME: 653 case SchedulerStateMachine::ACTION_SEND_BEGIN_MAIN_FRAME:
654 compositor_timing_history_->WillBeginMainFrame( 654 compositor_timing_history_->WillBeginMainFrame(
655 begin_main_frame_args_.on_critical_path); 655 begin_main_frame_args_.on_critical_path);
656 state_machine_.WillSendBeginMainFrame(); 656 state_machine_.WillSendBeginMainFrame();
657 // TODO(brianderson): Pass begin_main_frame_args_ directly to client. 657 // TODO(brianderson): Pass begin_main_frame_args_ directly to client.
658 client_->ScheduledActionSendBeginMainFrame(); 658 client_->ScheduledActionSendBeginMainFrame(begin_main_frame_args_);
659 break; 659 break;
660 case SchedulerStateMachine::ACTION_COMMIT: { 660 case SchedulerStateMachine::ACTION_COMMIT: {
661 // TODO(robliao): Remove ScopedTracker below once crbug.com/461509 is 661 // TODO(robliao): Remove ScopedTracker below once crbug.com/461509 is
662 // fixed. 662 // fixed.
663 tracked_objects::ScopedTracker tracking_profile4( 663 tracked_objects::ScopedTracker tracking_profile4(
664 FROM_HERE_WITH_EXPLICIT_FUNCTION( 664 FROM_HERE_WITH_EXPLICIT_FUNCTION(
665 "461509 Scheduler::ProcessScheduledActions4")); 665 "461509 Scheduler::ProcessScheduledActions4"));
666 bool commit_has_no_updates = false; 666 bool commit_has_no_updates = false;
667 state_machine_.WillCommit(commit_has_no_updates); 667 state_machine_.WillCommit(commit_has_no_updates);
668 client_->ScheduledActionCommit(); 668 client_->ScheduledActionCommit();
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
847 } 847 }
848 848
849 bool Scheduler::IsBeginMainFrameSentOrStarted() const { 849 bool Scheduler::IsBeginMainFrameSentOrStarted() const {
850 return (state_machine_.begin_main_frame_state() == 850 return (state_machine_.begin_main_frame_state() ==
851 SchedulerStateMachine::BEGIN_MAIN_FRAME_STATE_SENT || 851 SchedulerStateMachine::BEGIN_MAIN_FRAME_STATE_SENT ||
852 state_machine_.begin_main_frame_state() == 852 state_machine_.begin_main_frame_state() ==
853 SchedulerStateMachine::BEGIN_MAIN_FRAME_STATE_STARTED); 853 SchedulerStateMachine::BEGIN_MAIN_FRAME_STATE_STARTED);
854 } 854 }
855 855
856 } // namespace cc 856 } // namespace cc
OLDNEW
« no previous file with comments | « cc/scheduler/scheduler.h ('k') | cc/scheduler/scheduler_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698