Make lost context and error message callbacks on GpuControl go to client

gpu/ipc/client/command_buffer_proxy_impl.cc

Index: gpu/ipc/client/command_buffer_proxy_impl.cc
diff --git a/gpu/ipc/client/command_buffer_proxy_impl.cc b/gpu/ipc/client/command_buffer_proxy_impl.cc
index 99474e6c272ef7afe8eacc545bd86aadd59230cc..8499f56efe2477eeb7c8845c51c36263f51427ea 100644
--- a/gpu/ipc/client/command_buffer_proxy_impl.cc
+++ b/gpu/ipc/client/command_buffer_proxy_impl.cc
@@ -13,6 +13,7 @@
 #include "base/stl_util.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/trace_event/trace_event.h"
+#include "gpu/command_buffer/client/gpu_control_client.h"
 #include "gpu/command_buffer/client/gpu_memory_buffer_manager.h"
 #include "gpu/command_buffer/common/cmd_buffer_common.h"
 #include "gpu/command_buffer/common/command_buffer_id.h"
@@ -41,6 +42,7 @@ CommandBufferProxyImpl::CommandBufferProxyImpl(GpuChannelHost* channel,
                                                int32_t route_id,
                                                int32_t stream_id)
     : lock_(nullptr),
+      gpu_control_client_(nullptr),
       channel_(channel),
       command_buffer_id_(CommandBufferProxyID(channel->channel_id(), route_id)),
       route_id_(route_id),
@@ -109,29 +111,27 @@ void CommandBufferProxyImpl::OnChannelError() {
 void CommandBufferProxyImpl::OnDestroyed(gpu::error::ContextLostReason reason,
                                          gpu::error::Error error) {
   CheckLock();
-  // Prevent any further messages from being sent.
-  if (channel_) {
-    channel_->DestroyCommandBuffer(this);
-    channel_ = nullptr;
-  }
+  DCHECK(gpu_control_client_);

[piman, 2016/04/11 21:54:26]

Same as InProcessCommandBuffer, I think we want to allow for this to be null.

 
   // When the client sees that the context is lost, they should delete this
   // CommandBufferProxyImpl and create a new one.
   last_state_.error = error;
   last_state_.context_lost_reason = reason;
 
-  if (!context_lost_callback_.is_null()) {
-    context_lost_callback_.Run();
-    // Avoid calling the error callback more than once.
-    context_lost_callback_.Reset();
+  // Prevent any further messages from being sent, and ensure we only call
+  // the client for lost context a single time.
+  if (channel_) {
+    channel_->DestroyCommandBuffer(this);
+    channel_ = nullptr;
+    gpu_control_client_->OnGpuControlLostContext();
   }
 }
 
 void CommandBufferProxyImpl::OnConsoleMessage(
     const GPUCommandBufferConsoleMessage& message) {
-  if (!console_message_callback_.is_null()) {
-    console_message_callback_.Run(message.message, message.id);
-  }
+  DCHECK(gpu_control_client_);

[piman, 2016/04/11 21:54:26]

(ditto)

+  gpu_control_client_->OnGpuControlErrorMessage(message.message.c_str(),
+                                                message.id);
 }
 
 void CommandBufferProxyImpl::AddDeletionObserver(DeletionObserver* observer) {
@@ -161,12 +161,6 @@ void CommandBufferProxyImpl::OnSignalAck(uint32_t id) {
   callback.Run();
 }
 
-void CommandBufferProxyImpl::SetContextLostCallback(
-    const base::Closure& callback) {
-  CheckLock();
-  context_lost_callback_ = callback;
-}
-
 bool CommandBufferProxyImpl::Initialize() {
   TRACE_EVENT0("gpu", "CommandBufferProxyImpl::Initialize");
   shared_state_shm_.reset(channel_->factory()
@@ -394,6 +388,11 @@ void CommandBufferProxyImpl::DestroyTransferBuffer(int32_t id) {
   Send(new GpuCommandBufferMsg_DestroyTransferBuffer(route_id_, id));
 }
 
+void CommandBufferProxyImpl::SetGpuControlClient(GpuControlClient* client) {
+  CheckLock();
+  gpu_control_client_ = client;
+}
+
 gpu::Capabilities CommandBufferProxyImpl::GetCapabilities() {
   return capabilities_;
 }
@@ -662,12 +661,6 @@ void CommandBufferProxyImpl::OnUpdateState(
     last_state_ = state;
 }
 
-void CommandBufferProxyImpl::SetOnConsoleMessageCallback(
-    const GpuConsoleMessageCallback& callback) {
-  CheckLock();
-  console_message_callback_ = callback;
-}
-
 void CommandBufferProxyImpl::TryUpdateState() {
   if (last_state_.error == gpu::error::kNoError)
     shared_state()->Read(&last_state_);