content: Move Surfaces related code out of RWHVA.

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 eab7d120fe5d567f6b029a164d294537364cd2c6..e6568dbb43caaddd59b6748d20d19d35b215e7fe 100644
--- a/content/browser/renderer_host/render_widget_host_view_android.h
+++ b/content/browser/renderer_host/render_widget_host_view_android.h
@@ -21,11 +21,10 @@
 #include "cc/input/selection.h"
 #include "cc/layers/surface_layer.h"
 #include "cc/output/begin_frame_args.h"
-#include "cc/surfaces/surface_factory_client.h"
-#include "cc/surfaces/surface_id.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"
+#include "content/browser/renderer_host/delegated_frame_host_android.h"
 #include "content/browser/renderer_host/ime_adapter_android.h"
 #include "content/browser/renderer_host/input/stylus_text_selector.h"
 #include "content/browser/renderer_host/render_widget_host_view_base.h"
@@ -37,15 +36,11 @@
 #include "ui/events/gesture_detection/filtered_gesture_provider.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/geometry/vector2d_f.h"
-#include "ui/gfx/selection_bound.h"
 #include "ui/touch_selection/touch_selection_controller.h"
 
 namespace cc {
 class CopyOutputResult;
 class Layer;
-class SurfaceFactory;
-class SurfaceIdAllocator;
-enum class SurfaceDrawStatus;
 }
 
 namespace blink {
@@ -70,10 +65,10 @@ struct TextInputState;
 // -----------------------------------------------------------------------------
 class CONTENT_EXPORT RenderWidgetHostViewAndroid
     : public RenderWidgetHostViewBase,
-      public cc::SurfaceFactoryClient,
       public ui::GestureProviderClient,
       public ui::WindowAndroidObserver,
       public DelegatedFrameEvictorClient,
+      public DelegatedFrameHostAndroidClient,
       public StylusTextSelectorClient,
       public ui::TouchSelectionControllerClient,
       public content::ContentViewCoreImplObserver {
@@ -166,10 +161,6 @@ class CONTENT_EXPORT RenderWidgetHostViewAndroid
                                           size_t end_offset) override;
   void OnDidNavigateMainFrameToNewPage() override;
 
-  // cc::SurfaceFactoryClient implementation.
-  void ReturnResources(const cc::ReturnedResourceArray& resources) override;
-  void SetBeginFrameSource(cc::BeginFrameSource* begin_frame_source) override;
-
   // ui::GestureProviderClient implementation.
   void OnGestureEvent(const ui::GestureEventData& gesture) override;
 
@@ -208,6 +199,12 @@ class CONTENT_EXPORT RenderWidgetHostViewAndroid
   void OnSelectionEvent(ui::SelectionEventType event) override;
   std::unique_ptr<ui::TouchHandleDrawable> CreateDrawable() override;
 
+  // DelegatedFrameHostAndroidClient implementation.
+  void AttachSurfaceLayer(scoped_refptr<cc::SurfaceLayer> layer) override;
+  void DetachSurfaceLayer() override;
+  void ReturnCompositorFrameResources(
+      const cc::ReturnedResourceArray& resources) override;
+
   // Non-virtual methods
   void SetContentViewCore(ContentViewCoreImpl* content_view_core);
   SkColor GetCachedBackgroundColor() const;
@@ -343,13 +340,10 @@ class CONTENT_EXPORT RenderWidgetHostViewAndroid
 
   scoped_refptr<cc::Layer> layer_;
 
-  std::unique_ptr<cc::SurfaceIdAllocator> id_allocator_;
-  std::unique_ptr<cc::SurfaceFactory> surface_factory_;
-  cc::SurfaceId surface_id_;
-  gfx::Size current_surface_size_;
+  // Manager for consuming compositor frames from the renderer.
+  std::unique_ptr<DelegatedFrameHostAndroid> delegated_frame_host_;
+
   cc::ReturnedResourceArray surface_returned_resources_;
-  gfx::Vector2dF location_bar_content_translation_;
-  cc::Selection<gfx::SelectionBound> current_viewport_selection_;
 
   // The most recent texture size that was pushed to the texture layer.
   gfx::Size texture_size_in_layer_;
@@ -357,7 +351,6 @@ class CONTENT_EXPORT RenderWidgetHostViewAndroid
   // The output surface id of the last received frame.
   uint32_t last_output_surface_id_;
 
-
   std::queue<base::Closure> ack_callbacks_;
 
   // Used to control and render overscroll-related effects.