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

android_webview/browser/aw_render_thread_context_provider.cc

 // Copyright 2015 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 "android_webview/browser/aw_render_thread_context_provider.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/lazy_instance.h"
 #include "base/trace_event/trace_event.h"
@@ skipping 38 matching lines @@
   attributes.depth_size = -1;
   attributes.samples = 0;
   attributes.sample_buffers = 0;
   attributes.bind_generates_resource = false;
   context_.reset(gpu::GLInProcessContext::Create(
       service, surface, surface->IsOffscreen(), gfx::kNullAcceleratedWidget,
       surface->GetSize(), nullptr /* share_context */, attributes,
       gfx::PreferDiscreteGpu, gpu::GLInProcessContextSharedMemoryLimits(),
       nullptr, nullptr));
 
-  context_->SetContextLostCallback(base::Bind(
+  context_->GetImplementation()->SetLostContextCallback(base::Bind(
       &AwRenderThreadContextProvider::OnLostContext, base::Unretained(this)));
 
   capabilities_.gpu = context_->GetImplementation()->capabilities();
 }
 
 AwRenderThreadContextProvider::~AwRenderThreadContextProvider() {
   DCHECK(main_thread_checker_.CalledOnValidThread());
   if (gr_context_)
     gr_context_->releaseResourcesAndAbandonContext();
 }
@@ skipping 68 matching lines @@
 
 void AwRenderThreadContextProvider::SetLostContextCallback(
     const LostContextCallback& lost_context_callback) {
   lost_context_callback_ = lost_context_callback;
 }
 
 void AwRenderThreadContextProvider::OnLostContext() {
   DCHECK(main_thread_checker_.CalledOnValidThread());
 
   if (!lost_context_callback_.is_null())
-    base::ResetAndReturn(&lost_context_callback_).Run();
+    lost_context_callback_.Run();
   if (gr_context_)
     gr_context_->abandonContext();
 }
 
 }  // namespace android_webview