mus: Reconnect to gpu process when it dies.

services/ui/ws/gpu_service_proxy.cc

 // 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.
 
 #include "services/ui/ws/gpu_service_proxy.h"
 
 #include "base/memory/shared_memory.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/threading/thread_task_runner_handle.h"
@@ skipping 25 matching lines @@
                  mojom::GpuServiceInternal* gpu_service_internal)
       : client_id_(client_id),
         gpu_info_(gpu_info),
         gpu_memory_buffer_manager_(gpu_memory_buffer_manager),
         gpu_service_internal_(gpu_service_internal) {
     DCHECK(gpu_memory_buffer_manager_);
     DCHECK(gpu_service_internal_);
   }
   ~GpuServiceImpl() override {}
 
+  void reset_gpu_service_internal(mojom::GpuServiceInternal* connection) {
+    gpu_service_internal_ = connection;
+  }
+
  private:
   void OnGpuChannelEstablished(const EstablishGpuChannelCallback& callback,
                                mojo::ScopedMessagePipeHandle channel_handle) {
     callback.Run(client_id_, std::move(channel_handle), *gpu_info_);
   }
 
   // mojom::GpuService overrides:
   void EstablishGpuChannel(
       const EstablishGpuChannelCallback& callback) override {
     // TODO(sad): crbug.com/617415 figure out how to generate a meaningful
@@ skipping 38 matching lines @@
 }  // namespace
 
 GpuServiceProxy::GpuServiceProxy(GpuServiceProxyDelegate* delegate)
     : delegate_(delegate),
       next_client_id_(kInternalGpuChannelClientId + 1),
       main_thread_task_runner_(base::ThreadTaskRunnerHandle::Get()) {
   gpu_main_.OnStart();
   // TODO(sad): Once GPU process is split, this would look like:
   //   connector->ConnectToInterface("gpu", &gpu_service_);
   gpu_main_.Create(GetProxy(&gpu_service_));
+  gpu_service_.set_connection_error_handler(
+      base::Bind(&GpuServiceProxy::OnGpuConnectionGone,
+                 base::Unretained(this)));
   gpu_service_->Initialize(
       base::Bind(&GpuServiceProxy::OnInitialized, base::Unretained(this)));
   gpu_memory_buffer_manager_ = base::MakeUnique<MusGpuMemoryBufferManager>(
       gpu_service_.get(), next_client_id_++);
 }
 
 GpuServiceProxy::~GpuServiceProxy() {
 }
 
 void GpuServiceProxy::Add(mojom::GpuServiceRequest request) {
-  mojo::MakeStrongBinding(
+  clients_.push_back(mojo::MakeStrongBinding(
       base::MakeUnique<GpuServiceImpl>(next_client_id_++, &gpu_info_,
                                        gpu_memory_buffer_manager_.get(),
                                        gpu_service_.get()),
-      std::move(request));
+      std::move(request)));
 }
 
 void GpuServiceProxy::CreateDisplayCompositor(
     cc::mojom::DisplayCompositorRequest request,
     cc::mojom::DisplayCompositorClientPtr client) {
   gpu_service_->CreateDisplayCompositor(std::move(request), std::move(client));
 }
 
 void GpuServiceProxy::OnInitialized(const gpu::GPUInfo& gpu_info) {
   gpu_info_ = gpu_info;
   delegate_->OnGpuServiceInitialized();
 }
 
+void GpuServiceProxy::OnGpuConnectionGone() {
+  // TODO(sad): Once GPU process is split, this would look like:
+  //   connector->ConnectToInterface("gpu", &gpu_service_);
+  gpu_main_.Create(GetProxy(&gpu_service_));
+  gpu_service_.set_connection_error_handler(
+      base::Bind(&GpuServiceProxy::OnGpuConnectionGone,
+                 base::Unretained(this)));
+  for (auto& weak_ptr : clients_) {
+    GpuServiceImpl* client = static_cast<GpuServiceImpl*>(weak_ptr->impl());
+    client->reset_gpu_service_internal(gpu_service_.get());
+  }
+}
+
 }  // namespace ws
 }  // namespace ui