Android: Consolidate and simplify VSync logic

content/browser/renderer_host/render_widget_host_view_android.h

Index: content/browser/renderer_host/render_widget_host_view_android.h
diff --git a/content/browser/renderer_host/render_widget_host_view_android.h b/content/browser/renderer_host/render_widget_host_view_android.h
index 274edbaa60805c75c6e9c30df2e4fe39d691b6a5..1e1de08dbbc0fe28e89c4b793287079f01125fdb 100644
--- a/content/browser/renderer_host/render_widget_host_view_android.h
+++ b/content/browser/renderer_host/render_widget_host_view_android.h
@@ -193,6 +193,8 @@ class RenderWidgetHostViewAndroid
   virtual void OnAttachCompositor() OVERRIDE {}
   virtual void OnDetachCompositor() OVERRIDE;
   virtual void OnWillDestroyWindow() OVERRIDE;
+  virtual void OnVSync(base::TimeTicks frame_time,
+                       base::TimeDelta vsync_period) OVERRIDE;
 
   // ImageTransportFactoryAndroidObserver implementation.
   virtual void OnLostResources() OVERRIDE;
@@ -210,7 +212,6 @@ class RenderWidgetHostViewAndroid
   void SendMouseEvent(const blink::WebMouseEvent& event);
   void SendMouseWheelEvent(const blink::WebMouseWheelEvent& event);
   void SendGestureEvent(const blink::WebGestureEvent& event);
-  void SendBeginFrame(const cc::BeginFrameArgs& args);
 
   void OnTextInputStateChanged(const ViewHostMsg_TextInputState_Params& params);
   void OnDidChangeBodyBackgroundColor(SkColor color);
@@ -232,10 +233,6 @@ class RenderWidgetHostViewAndroid
 
   void MoveCaret(const gfx::Point& point);
 
-  // Returns true when animation ticks are still needed. This avoids a separate
-  // round-trip for requesting follow-up animation.
-  bool Animate(base::TimeTicks frame_time);
-
   void SynchronousFrameMetadata(
       const cc::CompositorFrameMetadata& frame_metadata);
 
@@ -297,11 +294,16 @@ class RenderWidgetHostViewAndroid
   void InternalSwapCompositorFrame(uint32 output_surface_id,
                                    scoped_ptr<cc::CompositorFrame> frame);
 
+  void SetNeedsAnimate();
+  bool Animate(base::TimeTicks frame_time);
+
+
   // The model object.
   RenderWidgetHostImpl* host_;
 
   // Used to track whether this render widget needs a BeginFrame.
   bool needs_begin_frame_;
+  bool requested_vsync_for_touch_event_;
 
   bool is_showing_;