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 9ed6557dc63a32c0a1a954a3e12ba02ad0f025d6..e5dd2df4c6104401752485e194e80189797fd871 100644
--- a/android_webview/browser/surfaces_instance.h
+++ b/android_webview/browser/surfaces_instance.h
@@ -15,9 +15,9 @@
 #include "cc/surfaces/surface_id.h"
 
 namespace cc {
-class Display;
+class CompositorFrameSinkSupport;
+class CompositorFrameSinkSupportClient;

[boliu, 2017/01/24 16:16:52]

need to include this class in order to inherit from it, in which case don't need
this forward declaration

[Saman Sami, 2017/01/24 16:51:28]

Done.

 class SurfaceIdAllocator;
-class SurfaceFactory;
 class SurfaceManager;
 }
 
@@ -32,8 +32,7 @@ namespace android_webview {
 class ParentOutputSurface;
 
 class SurfacesInstance : public base::RefCounted<SurfacesInstance>,
-                         public cc::DisplayClient,
-                         public cc::SurfaceFactoryClient {
+                         public cc::CompositorFrameSinkSupportClient {
  public:
   static scoped_refptr<SurfacesInstance> GetOrCreateInstance();
 
@@ -53,30 +52,20 @@ class SurfacesInstance : public base::RefCounted<SurfacesInstance>,
   friend class base::RefCounted<SurfacesInstance>;
 
   SurfacesInstance();
-  ~SurfacesInstance() override;
-
-  // cc::DisplayClient overrides.
-  void DisplayOutputSurfaceLost() override;
-  void DisplayWillDrawAndSwap(
-      bool will_draw_and_swap,
-      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;
+  ~SurfacesInstance();

[boliu, 2017/01/24 16:16:52]

still need override for CompositorFrameSinkSupportClient

[Saman Sami, 2017/01/24 16:51:28]

Done.

 
   void SetEmptyRootFrame();
 
+  // cc::CompositorFrameSinkSupport implementation.
+  void DisplayOutputSurfaceLost() override;
+
   uint32_t next_client_id_;
 
   cc::FrameSinkId frame_sink_id_;
 
   std::unique_ptr<cc::SurfaceManager> surface_manager_;
-  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::LocalFrameId root_id_;
   std::vector<cc::SurfaceId> child_ids_;