Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(792)

Unified Diff: webkit/glue/webkitclient_impl.cc

Issue 7695016: Remove ifdef for USE_MONOTONIC_CLOCK_FOR_TIMER_SCHEDULING missed in r97524. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/glue/webkitclient_impl.cc
diff --git a/webkit/glue/webkitclient_impl.cc b/webkit/glue/webkitclient_impl.cc
index fb1c98d60631d1b3b9791c9b52e05b29a64c78fe..f8679b46d4ce342dbad39ce89c69795b33e6b06c 100644
--- a/webkit/glue/webkitclient_impl.cc
+++ b/webkit/glue/webkitclient_impl.cc
@@ -646,13 +646,10 @@ void WebKitClientImpl::SuspendSharedTimer() {
void WebKitClientImpl::ResumeSharedTimer() {
// The shared timer may have fired or been adjusted while we were suspended.
- if (--shared_timer_suspended_ == 0 && !shared_timer_.IsRunning())
-#ifdef WEBKIT_USE_MONOTONIC_CLOCK_FOR_TIMER_SCHEDULING
+ if (--shared_timer_suspended_ == 0 && !shared_timer_.IsRunning()) {
setSharedTimerFireInterval(
monotonicallyIncreasingTime() - shared_timer_fire_time_);
-#else
- setSharedTimerFireTime(shared_timer_fire_time_);
-#endif
+ }
}
} // namespace webkit_glue
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698