Revert of services/ui: Avoid thread hopping in the gpu process.

services/ui/gpu/gpu_service_internal.h

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef SERVICES_UI_GPU_GPU_SERVICE_INTERNAL_H_
 #define SERVICES_UI_GPU_GPU_SERVICE_INTERNAL_H_
 
 #include "base/callback.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/non_thread_safe.h"
@@ skipping 30 matching lines @@
 // the window server) over the mojom APIs. This is responsible for setting up
 // the connection to clients, allocating/free'ing gpu memory etc.
 class GpuServiceInternal : public gpu::GpuChannelManagerDelegate,
                            public mojom::GpuServiceInternal,
                            public base::NonThreadSafe {
  public:
   ~GpuServiceInternal() override;
 
   void Add(mojom::GpuServiceInternalRequest request);
 
+  gpu::GpuChannelManager* gpu_channel_manager() const {
+    return gpu_channel_manager_.get();
+  }
+
+  gpu::GpuMemoryBufferFactory* gpu_memory_buffer_factory() const {
+    return gpu_memory_buffer_factory_;
+  }
+
   // TODO(sad): These should be mojom API.
   gfx::GpuMemoryBufferHandle CreateGpuMemoryBuffer(
       gfx::GpuMemoryBufferId id,
       const gfx::Size& size,
       gfx::BufferFormat format,
       gfx::BufferUsage usage,
       int client_id,
       gpu::SurfaceHandle surface_handle);
   void DestroyGpuMemoryBuffer(gfx::GpuMemoryBufferId id,
                               int client_id,
                               const gpu::SyncToken& sync_token);
 
  private:
   friend class GpuMain;
 
   GpuServiceInternal(const gpu::GPUInfo& gpu_info,
                      gpu::GpuWatchdogThread* watchdog,
                      gpu::GpuMemoryBufferFactory* memory_buffer_factory);
 
-  void BindOnGpuThread(mojom::GpuServiceInternalRequest request);
-
+  void EstablishGpuChannelInternal(int32_t client_id,
+                                   uint64_t client_tracing_id,
+                                   bool preempts,
+                                   bool allow_view_command_buffers,
+                                   bool allow_real_time_streams,
+                                   const EstablishGpuChannelCallback& callback);
   gfx::GpuMemoryBufferHandle CreateGpuMemoryBufferFromeHandle(
       gfx::GpuMemoryBufferHandle buffer_handle,
       gfx::GpuMemoryBufferId id,
       const gfx::Size& size,
       gfx::BufferFormat format,
       int client_id);
 
   // gpu::GpuChannelManagerDelegate:
   void DidCreateOffscreenContext(const GURL& active_url) override;
   void DidDestroyChannel(int client_id) override;
@@ skipping 12 matching lines @@
   void SetActiveURL(const GURL& url) override;
 
   // mojom::GpuServiceInternal:
   void Initialize(const InitializeCallback& callback) override;
   void EstablishGpuChannel(
       int32_t client_id,
       uint64_t client_tracing_id,
       bool is_gpu_host,
       const EstablishGpuChannelCallback& callback) override;
 
+  void InitializeOnGpuThread(base::WaitableEvent* event);
+  void EstablishGpuChannelOnGpuThread(
+      int client_id,
+      uint64_t client_tracing_id,
+      bool preempts,
+      bool allow_view_command_buffers,
+      bool allow_real_time_streams,
+      mojo::ScopedMessagePipeHandle* channel_handle);
+
   // The main thread task runner.
   scoped_refptr<base::SingleThreadTaskRunner> main_task_runner_;
 
   // An event that will be signalled when we shutdown.
   base::WaitableEvent shutdown_event_;
 
   // The main thread for GpuService.
   base::Thread gpu_thread_;
 
   // The thread that handles IO events for GpuService.
@@ skipping 15 matching lines @@
   gpu::GPUInfo gpu_info_;
 
   mojo::Binding<mojom::GpuServiceInternal> binding_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuServiceInternal);
 };
 
 }  // namespace ui
 
 #endif  // SERVICES_UI_GPU_GPU_SERVICE_INTERNAL_H_