Revert 276130 "cc: Don't swap throttle BeginMainFrame within dea..."
commitd76d706344eddc60fe0bdc373a42f36d80174aa8
authorwittman@chromium.org <wittman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Tue, 10 Jun 2014 22:47:54 +0000 (10 22:47 +0000)
committerwittman@chromium.org <wittman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Tue, 10 Jun 2014 22:47:54 +0000 (10 22:47 +0000)
treef417beac29cd572d7936fe8e35015a00df8e355f
parent8b3d240ac8514045f28d8595cbed4832d09bd942
Revert 276130 "cc: Don't swap throttle BeginMainFrame within dea..."

Appears to be causing hang on Linux in WebRtcBrowserTests/WebRtcBrowserTest.EstablishAudioVideoCallAndVerifyMutingWorks.

http://build.chromium.org/p/chromium.linux/builders/Linux%20Tests/builds/11520/steps/content_browsertests/logs/EstablishAudioVideoCallAndVerifyMutingWorks_1

> cc: Don't swap throttle BeginMainFrame within deadline
>
> This will better reflect behavior prior to the
> OutputSurface+Scheduler refactor and will
> prevent us from skipping BeginMainFrames that
> the scheduler only meant to defer.
>
> BUG=381346
>
> Review URL: https://codereview.chromium.org/311353003

TBR=brianderson@chromium.org

Review URL: https://codereview.chromium.org/327963003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@276185 0039d316-1c4b-4281-b951-d872f2087c98
cc/scheduler/scheduler_state_machine.cc
cc/scheduler/scheduler_state_machine_unittest.cc