Avoid unnecessary restarts of the webkit shared timer, and when restarting, use

the given fire time instead of the current time.

This is an attempt to isolate and fix the mac / linux intl2 page cycler
regression.

TBR=jam
BUG=36310
TEST=none

Review URL: http://codereview.chromium.org/654001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39701 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 2 deletions

diff --git a/webkit/glue/webkitclient_impl.cc b/webkit/glue/webkitclient_impl.cc
index 49f3d91..9c4b6d3 100644
--- a/webkit/glue/webkitclient_impl.cc
+++ b/webkit/glue/webkitclient_impl.cc
@@ -101,6 +101,7 @@ static int ToMessageID(WebLocalizedString::Name name) {
 WebKitClientImpl::WebKitClientImpl()
     : main_loop_(MessageLoop::current()),
       shared_timer_func_(NULL),
+      shared_timer_fire_time_(0.0),
       shared_timer_suspended_(0) {
 }
 
@@ -257,6 +258,7 @@ void WebKitClientImpl::setSharedTimerFiredFunction(void (*func)()) {
 }
 
 void WebKitClientImpl::setSharedTimerFireTime(double fire_time) {
+  shared_timer_fire_time_ = fire_time;
   if (shared_timer_suspended_)
     return;
 
@@ -403,8 +405,9 @@ void WebKitClientImpl::SuspendSharedTimer() {
 }
 
 void WebKitClientImpl::ResumeSharedTimer() {
-  if (--shared_timer_suspended_ == 0)
-    setSharedTimerFireTime(currentTime());
+  // The shared timer may have fired or been adjusted while we were suspended.
+  if (--shared_timer_suspended_ == 0 && !shared_timer_.IsRunning())
+    setSharedTimerFireTime(shared_timer_fire_time_);
 }
 
 }  // namespace webkit_glue