Switching to CompositorFrameSinkSupport in android_webview::SurfacesInstance

android_webview/browser/surfaces_instance.h

Index: android_webview/browser/surfaces_instance.h
diff --git a/android_webview/browser/surfaces_instance.h b/android_webview/browser/surfaces_instance.h
index 35132b8c59e972b426d8228fc333be2a0fd79f88..1ba1316bf172a1fd2e506aa5cb42a19f0aa814bf 100644
--- a/android_webview/browser/surfaces_instance.h
+++ b/android_webview/browser/surfaces_instance.h
@@ -9,15 +9,16 @@
 #include <vector>
 
 #include "base/memory/ref_counted.h"
+#include "cc/surfaces/compositor_frame_sink_support_client.h"
 #include "cc/surfaces/display_client.h"
 #include "cc/surfaces/frame_sink_id.h"
-#include "cc/surfaces/surface_factory_client.h"
 #include "cc/surfaces/surface_id.h"
 
 namespace cc {
+class BeginFrameSource;
+class CompositorFrameSinkSupport;
 class Display;
 class SurfaceIdAllocator;
-class SurfaceFactory;
 class SurfaceManager;
 }
 
@@ -33,7 +34,7 @@ class ParentOutputSurface;
 
 class SurfacesInstance : public base::RefCounted<SurfacesInstance>,
                          public cc::DisplayClient,
-                         public cc::SurfaceFactoryClient {
+                         public cc::CompositorFrameSinkSupportClient {
  public:
   static scoped_refptr<SurfacesInstance> GetOrCreateInstance();
 
@@ -62,9 +63,11 @@ class SurfacesInstance : public base::RefCounted<SurfacesInstance>,
       const cc::RenderPassList& render_passes) override {}
   void DisplayDidDrawAndSwap() override {}
 
-  // cc::SurfaceFactoryClient implementation.
-  void ReturnResources(const cc::ReturnedResourceArray& resources) override;
-  void SetBeginFrameSource(cc::BeginFrameSource* begin_frame_source) override;
+  // cc::CompositorFrameSinkSupportClient implementation.
+  void DidReceiveCompositorFrameAck() override;
+  void OnBeginFrame(const cc::BeginFrameArgs& args) override;
+  void WillDrawSurface() override;
+  void ReclaimResources(const cc::ReturnedResourceArray& resources) override;
 
   void SetEmptyRootFrame();
 
@@ -76,7 +79,7 @@ class SurfacesInstance : public base::RefCounted<SurfacesInstance>,
   std::unique_ptr<cc::BeginFrameSource> begin_frame_source_;
   std::unique_ptr<cc::Display> display_;
   std::unique_ptr<cc::SurfaceIdAllocator> surface_id_allocator_;
-  std::unique_ptr<cc::SurfaceFactory> surface_factory_;
+  std::unique_ptr<cc::CompositorFrameSinkSupport> support_;
 
   cc::LocalSurfaceId root_id_;
   std::vector<cc::SurfaceId> child_ids_;