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

mojo/gles2/gles2_context.cc

 // Copyright 2014 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 "mojo/gles2/gles2_context.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <utility>
@@ skipping 10 matching lines @@
 const size_t kDefaultCommandBufferSize = 1024 * 1024;
 const size_t kDefaultStartTransferBufferSize = 1 * 1024 * 1024;
 const size_t kDefaultMinTransferBufferSize = 1 * 256 * 1024;
 const size_t kDefaultMaxTransferBufferSize = 16 * 1024 * 1024;
 }
 
 GLES2Context::GLES2Context(const std::vector<int32_t>& attribs,
                            mojo::ScopedMessagePipeHandle command_buffer_handle,
                            MojoGLES2ContextLost lost_callback,
                            void* closure)
-    : command_buffer_(this, attribs, std::move(command_buffer_handle)),
+    : command_buffer_(attribs, std::move(command_buffer_handle)),
       lost_callback_(lost_callback),
       closure_(closure) {}
 
 GLES2Context::~GLES2Context() {}
 
 bool GLES2Context::Initialize() {
+  command_buffer_.SetGpuControlClient(this);

[no sievers, 2016/04/07 21:07:58]

Won't GLES2Impl below clobber this and set itself as the client?

You probably want to set |lost_callback| as the callback on gles2 impl instead.

[danakj, 2016/04/07 21:45:19]

Yes I was doing this wrong like the GLInProcessContext before, fixed.

   if (!command_buffer_.Initialize())
     return false;
   gles2_helper_.reset(new gpu::gles2::GLES2CmdHelper(&command_buffer_));
   if (!gles2_helper_->Initialize(kDefaultCommandBufferSize))
     return false;
   gles2_helper_->SetAutomaticFlushes(false);
   transfer_buffer_.reset(new gpu::TransferBuffer(gles2_helper_.get()));
   gpu::Capabilities capabilities = command_buffer_.GetCapabilities();
   bool bind_generates_resource =
       !!capabilities.bind_generates_resource_chromium;
   // TODO(piman): Some contexts (such as compositor) want this to be true, so
   // this needs to be a public parameter.
   bool lose_context_when_out_of_memory = false;
   bool support_client_side_arrays = false;
   implementation_.reset(
       new gpu::gles2::GLES2Implementation(gles2_helper_.get(),
                                           NULL,
                                           transfer_buffer_.get(),
                                           bind_generates_resource,
                                           lose_context_when_out_of_memory,
                                           support_client_side_arrays,
                                           &command_buffer_));
   return implementation_->Initialize(kDefaultStartTransferBufferSize,
                                      kDefaultMinTransferBufferSize,
                                      kDefaultMaxTransferBufferSize,
                                      gpu::gles2::GLES2Implementation::kNoLimit);
 }
 
-void GLES2Context::ContextLost() { lost_callback_(closure_); }
+void GLES2Context::OnGpuControlLostContext() {
+  lost_callback_(closure_);
+}
 
 }  // namespace gles2