Revert 117824 - Convert use of int ms to TimeDelta in files owned by brettw.

content/renderer/render_widget.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/render_widget.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
@@ skipping 659 matching lines @@
                                25);
   }
   DoDeferredUpdateAndSendInputAck();
 }
 
 void RenderWidget::AnimateIfNeeded() {
   if (!animation_update_pending_)
     return;
 
   // Target 60FPS if vsync is on. Go as fast as we can if vsync is off.
-  base::TimeDelta animationInterval = IsRenderingVSynced() ?
-      base::TimeDelta::FromMilliseconds(16) : base::TimeDelta();
+  int animationInterval = IsRenderingVSynced() ? 16 : 0;
 
   base::Time now = base::Time::Now();
   if (now >= animation_floor_time_ || is_accelerated_compositing_active_) {
     TRACE_EVENT0("renderer", "RenderWidget::AnimateIfNeeded")
-    animation_floor_time_ = now + animationInterval;
+    animation_floor_time_ = now +
+        base::TimeDelta::FromMilliseconds(animationInterval);
     // Set a timer to call us back after animationInterval before
     // running animation callbacks so that if a callback requests another
     // we'll be sure to run it at the proper time.
     MessageLoop::current()->PostDelayedTask(
         FROM_HERE, base::Bind(&RenderWidget::AnimationCallback, this),
         animationInterval);
     animation_task_posted_ = true;
     animation_update_pending_ = false;
     webwidget_->animate(0.0);
     return;
   }
   TRACE_EVENT0("renderer", "EarlyOut_AnimatedTooRecently");
   if (animation_task_posted_)
     return;
   // This code uses base::Time::Now() to calculate the floor and next fire
   // time because javascript's Date object uses base::Time::Now().  The
   // message loop uses base::TimeTicks, which on windows can have a
   // different granularity than base::Time.
   // The upshot of all this is that this function might be called before
   // base::Time::Now() has advanced past the animation_floor_time_.  To
   // avoid exposing this delay to javascript, we keep posting delayed
   // tasks until base::Time::Now() has advanced far enough.
-  base::TimeDelta delay = animation_floor_time_ - now;
+  int64 delay = (animation_floor_time_ - now).InMillisecondsRoundedUp();
   animation_task_posted_ = true;
   MessageLoop::current()->PostDelayedTask(
       FROM_HERE, base::Bind(&RenderWidget::AnimationCallback, this), delay);
 }
 
 bool RenderWidget::IsRenderingVSynced() {
   // TODO(nduca): Forcing a driver to disable vsync (e.g. in a control panel) is
   // not caught by this check. This will lead to artificially low frame rates
   // for people who force vsync off at a driver level and expect Chrome to speed
   // up.
@@ skipping 842 matching lines @@
   }
 }
 
 bool RenderWidget::WillHandleMouseEvent(const WebKit::WebMouseEvent& event) {
   return false;
 }
 
 bool RenderWidget::WebWidgetHandlesCompositorScheduling() const {
   return false;
 }