Revert of [android] Make RWHVAndroid a BeginFrameObserver.

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 5ac2a2be7d0c6e08bf110a73b03ddbeed596cbf6..d29a0a9d0ff96b9b2c67a2d7f66287556797697f 100644
--- a/content/browser/renderer_host/render_widget_host_view_android.h
+++ b/content/browser/renderer_host/render_widget_host_view_android.h
@@ -20,7 +20,6 @@
 #include "base/process/process.h"
 #include "cc/input/selection.h"
 #include "cc/output/begin_frame_args.h"
-#include "cc/scheduler/begin_frame_source.h"
 #include "content/browser/accessibility/browser_accessibility_manager.h"
 #include "content/browser/android/content_view_core_impl_observer.h"
 #include "content/browser/renderer_host/delegated_frame_evictor.h"
@@ -32,7 +31,6 @@
 #include "content/public/browser/readback_types.h"
 #include "gpu/command_buffer/common/mailbox.h"
 #include "third_party/skia/include/core/SkColor.h"
-#include "ui/android/delegated_frame_host_android.h"
 #include "ui/android/view_android.h"
 #include "ui/android/window_android_observer.h"
 #include "ui/events/android/motion_event_android.h"
@@ -46,6 +44,10 @@
 
 namespace ui {
 struct DidOverscrollParams;
+}
+
+namespace ui {
+class DelegatedFrameHostAndroid;
 }
 
 namespace content {
@@ -68,9 +70,7 @@
       public StylusTextSelectorClient,
       public ui::TouchSelectionControllerClient,
       public content::ContentViewCoreImplObserver,
-      public content::TextInputManager::Observer,
-      public ui::DelegatedFrameHostAndroid::Client,
-      public cc::BeginFrameObserver {
+      public content::TextInputManager::Observer {
  public:
   RenderWidgetHostViewAndroid(RenderWidgetHostImpl* widget,
                               ContentViewCoreImpl* content_view_core);
@@ -165,6 +165,8 @@
   void OnRootWindowVisibilityChanged(bool visible) override;
   void OnAttachCompositor() override;
   void OnDetachCompositor() override;
+  void OnVSync(base::TimeTicks frame_time,
+               base::TimeDelta vsync_period) override;
   void OnAnimate(base::TimeTicks begin_frame_time) override;
   void OnActivityStopped() override;
   void OnActivityStarted() override;
@@ -193,15 +195,6 @@
   void OnSelectionEvent(ui::SelectionEventType event) override;
   std::unique_ptr<ui::TouchHandleDrawable> CreateDrawable() override;
 
-  // DelegatedFrameHostAndroid::Client implementation.
-  void SetBeginFrameSource(cc::BeginFrameSource* begin_frame_source) override;
-  void ReturnResources(const cc::ReturnedResourceArray& resources) override;
-
-  // cc::BeginFrameObserver implementation.
-  void OnBeginFrame(const cc::BeginFrameArgs& args) override;
-  const cc::BeginFrameArgs& LastUsedBeginFrameArgs() const override;
-  void OnBeginFrameSourcePausedChanged(bool paused) override;
-
   // Non-virtual methods
   void SetContentViewCore(ContentViewCoreImpl* content_view_core);
   SkColor GetCachedBackgroundColor() const;
@@ -293,16 +286,17 @@
   void DestroyDelegatedContent();
   void OnLostResources();
 
-  enum BeginFrameRequestType {
+  void ReturnResources(const cc::ReturnedResourceArray& resources);
+
+  enum VSyncRequestType {
     FLUSH_INPUT = 1 << 0,
     BEGIN_FRAME = 1 << 1,
     PERSISTENT_BEGIN_FRAME = 1 << 2
   };
-  void AddBeginFrameRequest(BeginFrameRequestType request);
-  void ClearBeginFrameRequest(BeginFrameRequestType request);
+  void RequestVSyncUpdate(uint32_t requests);
   void StartObservingRootWindow();
   void StopObservingRootWindow();
-  void SendBeginFrame(cc::BeginFrameArgs args);
+  void SendBeginFrame(base::TimeTicks frame_time, base::TimeDelta vsync_period);
   bool Animate(base::TimeTicks frame_time);
   void RequestDisallowInterceptTouchEvent();
 
@@ -315,13 +309,8 @@
   // The model object.
   RenderWidgetHostImpl* host_;
 
-  // The begin frame source being observed.  Null if none.
-  cc::BeginFrameSource* begin_frame_source_;
-  cc::BeginFrameArgs last_begin_frame_args_;
-
-  // Indicates whether and for what reason a request for begin frames has been
-  // issued. Used to control action dispatch at the next |OnBeginFrame()| call.
-  uint32_t outstanding_begin_frame_requests_;
+  // Used to control action dispatch at the next |OnVSync()| call.
+  uint32_t outstanding_vsync_requests_;
 
   bool is_showing_;