Add a Display and ContextProvider concept to mojom, use to recreate

services/gles2/gpu_impl.h

Index: services/gles2/gpu_impl.h
diff --git a/services/gles2/gpu_impl.h b/services/gles2/gpu_impl.h
index b8bce82c1e05df0f3047b33fa9e86b09f534c243..a5f2ae176c220f3012b28f0dceff341bc506fcb6 100644
--- a/services/gles2/gpu_impl.h
+++ b/services/gles2/gpu_impl.h
@@ -13,6 +13,7 @@
 #include "mojo/services/geometry/public/interfaces/geometry.mojom.h"
 #include "mojo/services/gpu/public/interfaces/command_buffer.mojom.h"
 #include "mojo/services/gpu/public/interfaces/gpu.mojom.h"
+#include "services/gles2/gpu_state.h"
 
 namespace gfx {
 class GLShareGroup;
@@ -29,55 +30,16 @@ namespace gles2 {
 
 class GpuImpl : public mojo::Gpu {
  public:
-  // We need to share these across all CommandBuffer instances so that contexts
-  // they create can share resources with each other via mailboxes.
-  class State : public base::RefCounted<State> {
-   public:
-    State();
-
-    // We run the CommandBufferImpl on the control_task_runner, which forwards
-    // most method class to the CommandBufferDriver, which runs on the "driver",
-    // thread (i.e., the thread on which GpuImpl instances are created).
-    scoped_refptr<base::SingleThreadTaskRunner> control_task_runner() {
-      return control_thread_.task_runner();
-    }
-
-    // These objects are intended to be used on the "driver" thread (i.e., the
-    // thread on which GpuImpl instances are created).
-    gfx::GLShareGroup* share_group() const { return share_group_.get(); }
-    gpu::gles2::MailboxManager* mailbox_manager() const {
-      return mailbox_manager_.get();
-    }
-    gpu::SyncPointManager* sync_point_manager() const {
-      return sync_point_manager_.get();
-    }
-
-   private:
-    friend class base::RefCounted<State>;
-    ~State();
-
-    base::Thread control_thread_;
-    scoped_refptr<gpu::SyncPointManager> sync_point_manager_;
-    scoped_refptr<gfx::GLShareGroup> share_group_;
-    scoped_refptr<gpu::gles2::MailboxManager> mailbox_manager_;
-  };
-
   GpuImpl(mojo::InterfaceRequest<mojo::Gpu> request,
-          const scoped_refptr<State>& state);
+          const scoped_refptr<GpuState>& state);
   ~GpuImpl() override;
 
-  void CreateOnscreenGLES2Context(
-      uint64_t native_viewport_id,
-      mojo::SizePtr size,
-      mojo::InterfaceRequest<mojo::CommandBuffer> command_buffer_request,
-      mojo::ViewportParameterListenerPtr listener) override;
-
+ private:
   void CreateOffscreenGLES2Context(mojo::InterfaceRequest<mojo::CommandBuffer>
                                        command_buffer_request) override;
 
- private:
   mojo::StrongBinding<Gpu> binding_;
-  scoped_refptr<State> state_;
+  scoped_refptr<GpuState> state_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuImpl);
 };