Revert of [Android] Consolidate vsync request logic in RWHVAndroid

content/browser/renderer_host/render_widget_host_view_android.h

 // 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.
 
 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_
 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_
 
 #include <map>
 #include <queue>
 
@@ skipping 314 matching lines @@
   void ReleaseLocksOnSurface();
 
   // Drop any incoming frames from the renderer when there are locks on the
   // current frame.
   void RetainFrame(uint32 output_surface_id,
                    scoped_ptr<cc::CompositorFrame> frame);
 
   void InternalSwapCompositorFrame(uint32 output_surface_id,
                                    scoped_ptr<cc::CompositorFrame> frame);
 
-  enum VSyncRequestType {
-    FLUSH_INPUT = 1 << 0,
-    BEGIN_FRAME = 1 << 1,
-    PERSISTENT_BEGIN_FRAME = 1 << 2
-  };
-  void RequestVSyncUpdate(uint32 requests);
-  void StartObservingRootWindow();
-  void StopObservingRootWindow();
-  void SendBeginFrame(base::TimeTicks frame_time, base::TimeDelta vsync_period);
   bool Animate(base::TimeTicks frame_time);
 
   void OnContentScrollingChange();
   bool IsContentScrolling() const;
 
   float GetDpiScale() const;
 
   // Handles all unprocessed and pending readback requests.
   void AbortPendingReadbackRequests();
 
   // The model object.
   RenderWidgetHostImpl* host_;
 
-  // Used to control action dispatch at the next |OnVSync()| call.
-  uint32 outstanding_vsync_requests_;
+  // Used to track whether this render widget needs a BeginFrame.
+  bool needs_begin_frame_;
 
   bool is_showing_;
 
   // ContentViewCoreImpl is our interface to the view system.
   ContentViewCoreImpl* content_view_core_;
 
   ImeAdapterAndroid ime_adapter_android_;
 
   // Body background color of the underlying document.
   SkColor cached_background_color_;
@@ skipping 25 matching lines @@
 
   // Handles gesture based text selection
   GestureTextSelector gesture_text_selector_;
 
   // Manages selection handle rendering and manipulation.
   // This will always be NULL if |content_view_core_| is NULL.
   scoped_ptr<TouchSelectionController> selection_controller_;
   bool touch_scrolling_;
   size_t potentially_active_fling_count_;
 
+  bool flush_input_requested_;
+
   int accelerated_surface_route_id_;
 
   // Size to use if we have no backing ContentViewCore
   gfx::Size default_size_;
 
   const bool using_synchronous_compositor_;
 
   scoped_ptr<DelegatedFrameEvictor> frame_evictor_;
 
   size_t locks_on_frame_count_;
@@ skipping 13 matching lines @@
 
   // List of readbackrequests waiting for arrival of a valid frame.
   std::queue<ReadbackRequest> readbacks_waiting_for_frame_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAndroid);
 };
 
 } // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_