aw: Share cc::Display instance

android_webview/browser/hardware_renderer.h

Index: android_webview/browser/hardware_renderer.h
diff --git a/android_webview/browser/hardware_renderer.h b/android_webview/browser/hardware_renderer.h
index f6d0d43453e4b866c8bd0498f3a152b3ada79916..4f081ce3378a89aec17254854d14e16de52c70e4 100644
--- a/android_webview/browser/hardware_renderer.h
+++ b/android_webview/browser/hardware_renderer.h
@@ -10,7 +10,6 @@
 #include "android_webview/browser/compositor_id.h"
 #include "android_webview/browser/render_thread_manager.h"
 #include "base/macros.h"
-#include "cc/surfaces/display_client.h"
 #include "cc/surfaces/surface_factory_client.h"
 #include "cc/surfaces/surface_id.h"
 
@@ -25,13 +24,11 @@ class SurfaceManager;
 
 namespace android_webview {
 
-class AwGLSurface;
 class ChildFrame;
-class ParentOutputSurface;
 class ScopedAppGLStateRestore;
+class SurfacesInstance;
 
-class HardwareRenderer : public cc::DisplayClient,
-                         public cc::SurfaceFactoryClient {
+class HardwareRenderer : public cc::SurfaceFactoryClient {
  public:
   explicit HardwareRenderer(RenderThreadManager* state);
   ~HardwareRenderer() override;
@@ -42,10 +39,6 @@ class HardwareRenderer : public cc::DisplayClient,
   void SetBackingFrameBufferObject(int framebuffer_binding_ext);
 
  private:
-  // cc::DisplayClient overrides.
-  void DisplayOutputSurfaceLost() override {}
-  void DisplaySetMemoryPolicy(const cc::ManagedMemoryPolicy& policy) override {}
-
   // cc::SurfaceFactoryClient implementation.
   void ReturnResources(const cc::ReturnedResourceArray& resources) override;
   void SetBeginFrameSource(cc::BeginFrameSource* begin_frame_source) override;
@@ -71,23 +64,16 @@ class HardwareRenderer : public cc::DisplayClient,
   // SurfaceFactory.
   std::unique_ptr<ChildFrame> child_frame_;
 
-  scoped_refptr<AwGLSurface> gl_surface_;
-
-  std::unique_ptr<cc::SurfaceManager> surface_manager_;
-  std::unique_ptr<cc::Display> display_;
-  std::unique_ptr<cc::SurfaceFactory> surface_factory_;
+  scoped_refptr<SurfacesInstance> surfaces_;
   std::unique_ptr<cc::SurfaceIdAllocator> surface_id_allocator_;
+  std::unique_ptr<cc::SurfaceFactory> surface_factory_;
   cc::SurfaceId child_id_;
-  cc::SurfaceId root_id_;
   CompositorID compositor_id_;
   // HardwareRenderer guarantees resources are returned in the order of
   // output_surface_id, and resources for old output surfaces are dropped.
   uint32_t last_committed_output_surface_id_;
   uint32_t last_submitted_output_surface_id_;
 
-  // This is owned by |display_|.
-  ParentOutputSurface* output_surface_;
-
   DISALLOW_COPY_AND_ASSIGN(HardwareRenderer);
 };