Revert of Fix gpu command buffer use after free by GrContext

content/browser/android/in_process/context_provider_in_process.cc

 // Copyright (c) 2013 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 "content/browser/android/in_process/context_provider_in_process.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/strings/stringprintf.h"
 #include "cc/output/managed_memory_policy.h"
 #include "content/common/gpu/client/grcontext_for_webgraphicscontext3d.h"
 #include "gpu/blink/webgraphicscontext3d_in_process_command_buffer_impl.h"
 #include "gpu/command_buffer/client/gles2_implementation.h"
 #include "third_party/skia/include/gpu/GrContext.h"
 
 using gpu_blink::WebGraphicsContext3DInProcessCommandBufferImpl;
 
 namespace content {
 
 class ContextProviderInProcess::LostContextCallbackProxy
     : public blink::WebGraphicsContext3D::WebGraphicsContextLostCallback {
  public:
   explicit LostContextCallbackProxy(ContextProviderInProcess* provider)
       : provider_(provider) {
-    provider_->WebContext3DImpl()->setContextLostCallback(this);
+    provider_->context3d_->setContextLostCallback(this);
   }
 
   virtual ~LostContextCallbackProxy() {
-    provider_->WebContext3DImpl()->setContextLostCallback(NULL);
+    provider_->context3d_->setContextLostCallback(NULL);
   }
 
   virtual void onContextLost() {
     provider_->OnLostContext();
   }
 
  private:
   ContextProviderInProcess* provider_;
 };
 
 // static
 scoped_refptr<ContextProviderInProcess> ContextProviderInProcess::Create(
     scoped_ptr<WebGraphicsContext3DInProcessCommandBufferImpl> context3d,
     const std::string& debug_name) {
   if (!context3d)
     return NULL;
   return new ContextProviderInProcess(context3d.Pass(), debug_name);
 }
 
 ContextProviderInProcess::ContextProviderInProcess(
     scoped_ptr<WebGraphicsContext3DInProcessCommandBufferImpl> context3d,
     const std::string& debug_name)
-    : debug_name_(debug_name) {
+    : context3d_(context3d.Pass()),
+      debug_name_(debug_name) {
   DCHECK(main_thread_checker_.CalledOnValidThread());
-  DCHECK(context3d);
-  gr_interface_ = skia::AdoptRef(new GrGLInterfaceForWebGraphicsContext3D(
-      context3d.Pass()));
-  DCHECK(gr_interface_->WebContext3D());
+  DCHECK(context3d_);
   context_thread_checker_.DetachFromThread();
 }
 
 ContextProviderInProcess::~ContextProviderInProcess() {
   DCHECK(main_thread_checker_.CalledOnValidThread() ||
          context_thread_checker_.CalledOnValidThread());
 }
 
 blink::WebGraphicsContext3D* ContextProviderInProcess::WebContext3D() {
   DCHECK(lost_context_callback_proxy_);  // Is bound to thread.
   DCHECK(context_thread_checker_.CalledOnValidThread());
 
-  return WebContext3DImpl();
-}
-
-gpu_blink::WebGraphicsContext3DInProcessCommandBufferImpl*
-    ContextProviderInProcess::WebContext3DImpl() {
-  DCHECK(gr_interface_->WebContext3D());
-
-  return
-      static_cast<gpu_blink::WebGraphicsContext3DInProcessCommandBufferImpl*>(
-          gr_interface_->WebContext3D());
+  return context3d_.get();
 }
 
 bool ContextProviderInProcess::BindToCurrentThread() {
-  DCHECK(WebContext3DImpl());
+  DCHECK(context3d_);
 
   // This is called on the thread the context will be used.
   DCHECK(context_thread_checker_.CalledOnValidThread());
 
   if (lost_context_callback_proxy_)
     return true;
 
-  if (!WebContext3DImpl()->InitializeOnCurrentThread())
+  if (!context3d_->InitializeOnCurrentThread())
     return false;
 
-  gr_interface_->BindToCurrentThread();
   InitializeCapabilities();
 
   const std::string unique_context_name =
-      base::StringPrintf("%s-%p", debug_name_.c_str(), WebContext3DImpl());
-  WebContext3DImpl()->traceBeginCHROMIUM("gpu_toplevel",
+      base::StringPrintf("%s-%p", debug_name_.c_str(), context3d_.get());
+  context3d_->traceBeginCHROMIUM("gpu_toplevel",
                                  unique_context_name.c_str());
 
   lost_context_callback_proxy_.reset(new LostContextCallbackProxy(this));
   return true;
 }
 
 void ContextProviderInProcess::DetachFromThread() {
   context_thread_checker_.DetachFromThread();
 }
 
 void ContextProviderInProcess::InitializeCapabilities() {
-  capabilities_.gpu = WebContext3DImpl()->GetImplementation()->capabilities();
+  capabilities_.gpu = context3d_->GetImplementation()->capabilities();
 
-  size_t mapped_memory_limit = WebContext3DImpl()->GetMappedMemoryLimit();
+  size_t mapped_memory_limit = context3d_->GetMappedMemoryLimit();
   capabilities_.max_transfer_buffer_usage_bytes =
       mapped_memory_limit ==
               WebGraphicsContext3DInProcessCommandBufferImpl::kNoLimit
           ? std::numeric_limits<size_t>::max()
           : mapped_memory_limit;
 }
 
 cc::ContextProvider::Capabilities
 ContextProviderInProcess::ContextCapabilities() {
   DCHECK(lost_context_callback_proxy_);  // Is bound to thread.
   DCHECK(context_thread_checker_.CalledOnValidThread());
   return capabilities_;
 }
 
 ::gpu::gles2::GLES2Interface* ContextProviderInProcess::ContextGL() {
-  DCHECK(WebContext3DImpl());
+  DCHECK(context3d_);
   DCHECK(lost_context_callback_proxy_);  // Is bound to thread.
   DCHECK(context_thread_checker_.CalledOnValidThread());
 
-  return WebContext3DImpl()->GetGLInterface();
+  return context3d_->GetGLInterface();
 }
 
 ::gpu::ContextSupport* ContextProviderInProcess::ContextSupport() {
-  DCHECK(WebContext3DImpl());
+  DCHECK(context3d_);
   if (!lost_context_callback_proxy_)
     return NULL;  // Not bound to anything.
 
   DCHECK(context_thread_checker_.CalledOnValidThread());
 
-  return WebContext3DImpl()->GetContextSupport();
+  return context3d_->GetContextSupport();
 }
 
 class GrContext* ContextProviderInProcess::GrContext() {
   DCHECK(lost_context_callback_proxy_);  // Is bound to thread.
   DCHECK(context_thread_checker_.CalledOnValidThread());
 
   if (gr_context_)
     return gr_context_->get();
 
-  gr_context_.reset(new GrContextForWebGraphicsContext3D(gr_interface_));
+  gr_context_.reset(new GrContextForWebGraphicsContext3D(context3d_.get()));
   return gr_context_->get();
 }
 
 void ContextProviderInProcess::InvalidateGrContext(uint32_t state) {
   DCHECK(lost_context_callback_proxy_);  // Is bound to thread.
   DCHECK(context_thread_checker_.CalledOnValidThread());
 
   if (gr_context_)
     return gr_context_->get()->resetContext(state);
 }
 
 void ContextProviderInProcess::SetupLock() {
-  WebContext3DImpl()->SetLock(&context_lock_);
+  context3d_->SetLock(&context_lock_);
 }
 
 base::Lock* ContextProviderInProcess::GetLock() {
   return &context_lock_;
 }
 
 void ContextProviderInProcess::DeleteCachedResources() {
   DCHECK(context_thread_checker_.CalledOnValidThread());
 
   if (gr_context_)
@@ skipping 10 matching lines @@
 
 void ContextProviderInProcess::SetLostContextCallback(
     const LostContextCallback& lost_context_callback) {
   DCHECK(context_thread_checker_.CalledOnValidThread());
   DCHECK(lost_context_callback_.is_null() ||
          lost_context_callback.is_null());
   lost_context_callback_ = lost_context_callback;
 }
 
 }  // namespace content