Index: cc/scheduler/scheduler.cc |
diff --git a/cc/scheduler/scheduler.cc b/cc/scheduler/scheduler.cc |
index 4fa133cb3538e608f32053b216d68aef12fdcfc4..d603086725b002350f2a8733dfd6743129563fc9 100644 |
--- a/cc/scheduler/scheduler.cc |
+++ b/cc/scheduler/scheduler.cc |
@@ -592,11 +592,6 @@ void Scheduler::OnBeginImplFrameDeadline() { |
// order to wait for more user-input before starting the next commit. |
// * Creating a new OuputSurface will not occur during the deadline in |
// order to allow the state machine to "settle" first. |
- |
- // TODO(robliao): Remove ScopedTracker below once crbug.com/461509 is fixed. |
- tracked_objects::ScopedTracker tracking_profile1( |
- FROM_HERE_WITH_EXPLICIT_FUNCTION( |
- "461509 Scheduler::OnBeginImplFrameDeadline1")); |
compositor_timing_history_->WillFinishImplFrame( |
state_machine_.needs_redraw()); |
state_machine_.OnBeginImplFrameDeadline(); |
@@ -666,11 +661,6 @@ void Scheduler::ProcessScheduledActions() { |
client_->ScheduledActionSendBeginMainFrame(begin_main_frame_args_); |
break; |
case SchedulerStateMachine::ACTION_COMMIT: { |
- // TODO(robliao): Remove ScopedTracker below once crbug.com/461509 is |
- // fixed. |
- tracked_objects::ScopedTracker tracking_profile4( |
- FROM_HERE_WITH_EXPLICIT_FUNCTION( |
- "461509 Scheduler::ProcessScheduledActions4")); |
bool commit_has_no_updates = false; |
state_machine_.WillCommit(commit_has_no_updates); |
client_->ScheduledActionCommit(); |
@@ -682,15 +672,9 @@ void Scheduler::ProcessScheduledActions() { |
client_->ScheduledActionActivateSyncTree(); |
compositor_timing_history_->DidActivate(); |
break; |
- case SchedulerStateMachine::ACTION_DRAW_AND_SWAP_IF_POSSIBLE: { |
- // TODO(robliao): Remove ScopedTracker below once crbug.com/461509 is |
- // fixed. |
- tracked_objects::ScopedTracker tracking_profile6( |
- FROM_HERE_WITH_EXPLICIT_FUNCTION( |
- "461509 Scheduler::ProcessScheduledActions6")); |
+ case SchedulerStateMachine::ACTION_DRAW_AND_SWAP_IF_POSSIBLE: |
DrawAndSwapIfPossible(); |
break; |
- } |
case SchedulerStateMachine::ACTION_DRAW_AND_SWAP_FORCED: |
DrawAndSwapForced(); |
break; |