android_webview: Remove dependency on webkit's ContextProviderInProcess.

android_webview/browser/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 "ui/compositor/test/in_process_context_provider.h"
+#include "android_webview/browser/context_provider_in_process.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/lazy_instance.h"
 #include "base/strings/stringprintf.h"
 #include "base/trace_event/trace_event.h"
 #include "cc/output/managed_memory_policy.h"
 #include "gpu/command_buffer/client/gl_in_process_context.h"
 #include "gpu/command_buffer/client/gles2_implementation.h"
 #include "gpu/command_buffer/client/gles2_lib.h"
 #include "gpu/skia_bindings/gl_bindings_skia_cmd_buffer.h"
 #include "third_party/skia/include/gpu/GrContext.h"
 #include "third_party/skia/include/gpu/gl/GrGLInterface.h"
 
-namespace ui {
+namespace android_webview {
 
 namespace {
 
 // Singleton used to initialize and terminate the gles2 library.
 class GLES2Initializer {
  public:
   GLES2Initializer() { gles2::Initialize(); }
 
   ~GLES2Initializer() { gles2::Terminate(); }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(GLES2Initializer);
 };
 
 base::LazyInstance<GLES2Initializer> g_gles2_initializer =
     LAZY_INSTANCE_INITIALIZER;
 
 }  // namespace
 
 // static
-scoped_refptr<InProcessContextProvider> InProcessContextProvider::Create(
-    const gpu::gles2::ContextCreationAttribHelper& attribs,
-    bool lose_context_when_out_of_memory,
-    gfx::AcceleratedWidget window,
+scoped_refptr<ContextProviderInProcess> ContextProviderInProcess::Create(

[tfarina, 2015/04/19 02:46:33]

Which parameters should I pass here?

[boliu, 2015/04/19 08:40:07]

You can hardcode all of these values I think. There's only HardwareRenderer uses
the new ContextProvider, so no need for customization at all at this point.

[tfarina, 2015/04/19 13:29:53]

Done.

     const std::string& debug_name) {
-  return new InProcessContextProvider(
-      attribs, lose_context_when_out_of_memory, window, debug_name);
+  return new ContextProviderInProcess(debug_name);
 }
 
-// static
-scoped_refptr<InProcessContextProvider>
-InProcessContextProvider::CreateOffscreen(
-    bool lose_context_when_out_of_memory) {
-  gpu::gles2::ContextCreationAttribHelper attribs;
-  attribs.alpha_size = 8;
-  attribs.blue_size = 8;
-  attribs.green_size = 8;
-  attribs.red_size = 8;
-  attribs.depth_size = 0;
-  attribs.stencil_size = 8;
-  attribs.samples = 0;
-  attribs.sample_buffers = 0;
-  attribs.fail_if_major_perf_caveat = false;
-  attribs.bind_generates_resource = false;
-  return new InProcessContextProvider(
-      attribs, lose_context_when_out_of_memory, gfx::kNullAcceleratedWidget,
-      "Offscreen");
-}
-
-InProcessContextProvider::InProcessContextProvider(
-    const gpu::gles2::ContextCreationAttribHelper& attribs,
-    bool lose_context_when_out_of_memory,
-    gfx::AcceleratedWidget window,
+ContextProviderInProcess::ContextProviderInProcess(
     const std::string& debug_name)
-    : attribs_(attribs),
-      lose_context_when_out_of_memory_(lose_context_when_out_of_memory),
-      window_(window),
-      debug_name_(debug_name),
+    : debug_name_(debug_name),
       destroyed_(false) {
   DCHECK(main_thread_checker_.CalledOnValidThread());
   context_thread_checker_.DetachFromThread();
 }
 
-InProcessContextProvider::~InProcessContextProvider() {
+ContextProviderInProcess::~ContextProviderInProcess() {
   DCHECK(main_thread_checker_.CalledOnValidThread() ||
          context_thread_checker_.CalledOnValidThread());
 }
 
-bool InProcessContextProvider::BindToCurrentThread() {
+bool ContextProviderInProcess::BindToCurrentThread() {
   // This is called on the thread the context will be used.
   DCHECK(context_thread_checker_.CalledOnValidThread());
 
-  if (!context_) {
-    gfx::GpuPreference gpu_preference = gfx::PreferDiscreteGpu;

[tfarina, 2015/04/19 02:46:33]

What should goes in, in our implementation?

[boliu, 2015/04/19 08:40:07]

Create a GLInProcessContext and use that directly.

I didn't know InProcessContextProvider existed. That's indeed a better starting
point than the one under webkit/.

[tfarina, 2015/04/19 13:29:53]

Done.

-    context_.reset(gpu::GLInProcessContext::Create(
-        nullptr,                           /* service */
-        nullptr,                           /* surface */
-        !window_,                          /* is_offscreen */
-        window_, gfx::Size(1, 1), nullptr, /* share_context */
-        true,                              /* share_resources */
-        attribs_, gpu_preference, gpu::GLInProcessContextSharedMemoryLimits(),
-        nullptr, nullptr));
-
-    if (!context_)
-      return false;
-
-    context_->SetContextLostCallback(base::Bind(
-        &InProcessContextProvider::OnLostContext, base::Unretained(this)));
-  }
-
   capabilities_.gpu = context_->GetImplementation()->capabilities();
 
   std::string unique_context_name =
       base::StringPrintf("%s-%p", debug_name_.c_str(), context_.get());
   context_->GetImplementation()->TraceBeginCHROMIUM(
       "gpu_toplevel", unique_context_name.c_str());
 
   return true;
 }
 
 cc::ContextProvider::Capabilities
-InProcessContextProvider::ContextCapabilities() {
+ContextProviderInProcess::ContextCapabilities() {
   DCHECK(context_thread_checker_.CalledOnValidThread());
   return capabilities_;
 }
 
-gpu::gles2::GLES2Interface* InProcessContextProvider::ContextGL() {
+gpu::gles2::GLES2Interface* ContextProviderInProcess::ContextGL() {
   DCHECK(context_thread_checker_.CalledOnValidThread());
 
   return context_->GetImplementation();
 }
 
-gpu::ContextSupport* InProcessContextProvider::ContextSupport() {
+gpu::ContextSupport* ContextProviderInProcess::ContextSupport() {
   DCHECK(context_thread_checker_.CalledOnValidThread());
 
   return context_->GetImplementation();
 }
 
 static void BindGrContextCallback(const GrGLInterface* interface) {
   cc::ContextProvider* context_provider =
-      reinterpret_cast<InProcessContextProvider*>(interface->fCallbackData);
+      reinterpret_cast<ContextProviderInProcess*>(interface->fCallbackData);
 
   gles2::SetGLContext(context_provider->ContextGL());
 }
 
-class GrContext* InProcessContextProvider::GrContext() {
+class GrContext* ContextProviderInProcess::GrContext() {
   DCHECK(context_thread_checker_.CalledOnValidThread());
 
   if (gr_context_)
     return gr_context_.get();
 
   // The GrGLInterface factory will make GL calls using the C GLES2 interface.
   // Make sure the gles2 library is initialized first on exactly one thread.
   g_gles2_initializer.Get();
   gles2::SetGLContext(ContextGL());
 
   skia::RefPtr<GrGLInterface> interface =
       skia::AdoptRef(skia_bindings::CreateCommandBufferSkiaGLBinding());
   interface->fCallback = BindGrContextCallback;
   interface->fCallbackData = reinterpret_cast<GrGLInterfaceCallbackData>(this);
 
   gr_context_ = skia::AdoptRef(GrContext::Create(
       kOpenGL_GrBackend, reinterpret_cast<GrBackendContext>(interface.get())));
 
   return gr_context_.get();
 }
 
-void InProcessContextProvider::SetupLock() {
+void ContextProviderInProcess::SetupLock() {
 }
 
-base::Lock* InProcessContextProvider::GetLock() {
+base::Lock* ContextProviderInProcess::GetLock() {
   return &context_lock_;
 }
 
-bool InProcessContextProvider::IsContextLost() {
+bool ContextProviderInProcess::IsContextLost() {
   DCHECK(context_thread_checker_.CalledOnValidThread());
 
   base::AutoLock lock(destroyed_lock_);
   return destroyed_;
 }
 
-void InProcessContextProvider::VerifyContexts() {
+void ContextProviderInProcess::VerifyContexts() {
 }
 
-void InProcessContextProvider::DeleteCachedResources() {
+void ContextProviderInProcess::DeleteCachedResources() {
   DCHECK(context_thread_checker_.CalledOnValidThread());
 
   if (gr_context_) {
     TRACE_EVENT_INSTANT0("gpu", "GrContext::freeGpuResources",
                          TRACE_EVENT_SCOPE_THREAD);
     gr_context_->freeGpuResources();
   }
 }
 
-bool InProcessContextProvider::DestroyedOnMainThread() {
+bool ContextProviderInProcess::DestroyedOnMainThread() {
   DCHECK(main_thread_checker_.CalledOnValidThread());
 
   base::AutoLock lock(destroyed_lock_);
   return destroyed_;
 }
 
-void InProcessContextProvider::SetLostContextCallback(
+void ContextProviderInProcess::SetLostContextCallback(
     const LostContextCallback& lost_context_callback) {
   lost_context_callback_ = lost_context_callback;
 }
 
-void InProcessContextProvider::SetMemoryPolicyChangedCallback(
+void ContextProviderInProcess::SetMemoryPolicyChangedCallback(
     const MemoryPolicyChangedCallback& memory_policy_changed_callback) {
   // There's no memory manager for the in-process implementation.
 }
 
-void InProcessContextProvider::OnLostContext() {
+void ContextProviderInProcess::OnLostContext() {
   DCHECK(context_thread_checker_.CalledOnValidThread());
   {
     base::AutoLock lock(destroyed_lock_);
     if (destroyed_)
       return;
     destroyed_ = true;
   }
   if (!lost_context_callback_.is_null())
     base::ResetAndReturn(&lost_context_callback_).Run();
   if (gr_context_)
     gr_context_->abandonContext();
 }
 
 }  // namespace ui