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/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 688 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
699 break; | 699 break; |
700 case SchedulerStateMachine::ACTION_ANIMATE: { | 700 case SchedulerStateMachine::ACTION_ANIMATE: { |
701 // TODO(robliao): Remove ScopedTracker below once crbug.com/461509 is | 701 // TODO(robliao): Remove ScopedTracker below once crbug.com/461509 is |
702 // fixed. | 702 // fixed. |
703 tracked_objects::ScopedTracker tracking_profile2( | 703 tracked_objects::ScopedTracker tracking_profile2( |
704 FROM_HERE_WITH_EXPLICIT_FUNCTION( | 704 FROM_HERE_WITH_EXPLICIT_FUNCTION( |
705 "461509 Scheduler::ProcessScheduledActions2")); | 705 "461509 Scheduler::ProcessScheduledActions2")); |
706 client_->ScheduledActionAnimate(); | 706 client_->ScheduledActionAnimate(); |
707 break; | 707 break; |
708 } | 708 } |
| 709 case SchedulerStateMachine::ACTION_CUSTOM_MUTATE: { |
| 710 client_->ScheduledActionCustomMutate(); |
| 711 break; |
| 712 } |
709 case SchedulerStateMachine::ACTION_SEND_BEGIN_MAIN_FRAME: { | 713 case SchedulerStateMachine::ACTION_SEND_BEGIN_MAIN_FRAME: { |
710 // TODO(robliao): Remove ScopedTracker below once crbug.com/461509 is | 714 // TODO(robliao): Remove ScopedTracker below once crbug.com/461509 is |
711 // fixed. | 715 // fixed. |
712 tracked_objects::ScopedTracker tracking_profile3( | 716 tracked_objects::ScopedTracker tracking_profile3( |
713 FROM_HERE_WITH_EXPLICIT_FUNCTION( | 717 FROM_HERE_WITH_EXPLICIT_FUNCTION( |
714 "461509 Scheduler::ProcessScheduledActions3")); | 718 "461509 Scheduler::ProcessScheduledActions3")); |
715 client_->ScheduledActionSendBeginMainFrame(); | 719 client_->ScheduledActionSendBeginMainFrame(); |
716 break; | 720 break; |
717 } | 721 } |
718 case SchedulerStateMachine::ACTION_COMMIT: { | 722 case SchedulerStateMachine::ACTION_COMMIT: { |
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
868 } | 872 } |
869 | 873 |
870 bool Scheduler::IsBeginMainFrameSentOrStarted() const { | 874 bool Scheduler::IsBeginMainFrameSentOrStarted() const { |
871 return (state_machine_.commit_state() == | 875 return (state_machine_.commit_state() == |
872 SchedulerStateMachine::COMMIT_STATE_BEGIN_MAIN_FRAME_SENT || | 876 SchedulerStateMachine::COMMIT_STATE_BEGIN_MAIN_FRAME_SENT || |
873 state_machine_.commit_state() == | 877 state_machine_.commit_state() == |
874 SchedulerStateMachine::COMMIT_STATE_BEGIN_MAIN_FRAME_STARTED); | 878 SchedulerStateMachine::COMMIT_STATE_BEGIN_MAIN_FRAME_STARTED); |
875 } | 879 } |
876 | 880 |
877 } // namespace cc | 881 } // namespace cc |
OLD | NEW |