diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-20 10:50:38 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-20 10:50:38 +0000 |
| commit | 21766d7536424c43a8d677bedeb8c81e6cce41c7 (patch) | |
| tree | e9da0d1983b21f2459ba8fdc56699a252b4bda38 /base/message_loop.cc | |
| parent | e97c2822866796a872cb59c12a5e831e98b085d3 (diff) | |
| download | chromium_src-21766d7536424c43a8d677bedeb8c81e6cce41c7.zip chromium_src-21766d7536424c43a8d677bedeb8c81e6cce41c7.tar.gz chromium_src-21766d7536424c43a8d677bedeb8c81e6cce41c7.tar.bz2 | |
Revert 63191 - 2nd try:
Fix regression where high resolution timers could be activated even under
battery power. Add unit test to protect chromium from developers like me
in the future.
The fix is a one-liner in hi_res_timer_manager_win.cc. The rest of the code
change is the mechanics to enable the unit test.
BUG=59528
TEST=HiResTimerManagerTest.ToggleOnOff
Broke unit_tests on Vista and XP:
[ RUN ] GeolocationNetworkProviderTest.GatewayAndWifiScans
[2916:2376:1020/030222:2975321329:FATAL:network_location_provider.cc(51)] Check failed: cache_.size() == cache_times_.size().
Review URL: http://codereview.chromium.org/3889004
TBR=mbelshe@chromium.org
Review URL: http://codereview.chromium.org/3946003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63200 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/message_loop.cc')
| -rw-r--r-- | base/message_loop.cc | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/base/message_loop.cc b/base/message_loop.cc index 0b03d3c..8f6c997b 100644 --- a/base/message_loop.cc +++ b/base/message_loop.cc @@ -179,16 +179,6 @@ MessageLoop::~MessageLoop() { // OK, now make it so that no one can find us. lazy_tls_ptr.Pointer()->Set(NULL); - -#if defined(OS_WIN) - // If we left the high-resolution timer activated, deactivate it now. - // Doing this is not-critical, it is mainly to make sure we track - // the high resolution timer activations properly in our unit tests. - if (!high_resolution_timer_expiration_.is_null()) { - Time::ActivateHighResolutionTimer(false); - high_resolution_timer_expiration_ = base::TimeTicks(); - } -#endif } void MessageLoop::AddDestructionObserver( @@ -347,10 +337,9 @@ void MessageLoop::PostTask_Helper( bool needs_high_res_timers = delay_ms < (2 * Time::kMinLowResolutionThresholdMs); if (needs_high_res_timers) { - if (Time::ActivateHighResolutionTimer(true)) { - high_resolution_timer_expiration_ = base::TimeTicks::Now() + - TimeDelta::FromMilliseconds(kHighResolutionTimerModeLeaseTimeMs); - } + Time::ActivateHighResolutionTimer(true); + high_resolution_timer_expiration_ = base::TimeTicks::Now() + + TimeDelta::FromMilliseconds(kHighResolutionTimerModeLeaseTimeMs); } } #endif |