Remove base::Callback from ContextProvider creation.

webkit/common/gpu/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 "webkit/common/gpu/context_provider_in_process.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "cc/output/managed_memory_policy.h"
 #include "webkit/common/gpu/grcontext_for_webgraphicscontext3d.h"
@@ skipping 60 matching lines @@
       WebKit::WebGraphicsMemoryAllocation allocation) {
     provider_->OnMemoryAllocationChanged(allocation);
   }
 
  private:
   ContextProviderInProcess* provider_;
 };
 
 // static
 scoped_refptr<ContextProviderInProcess> ContextProviderInProcess::Create(
-    const CreateCallback& create_callback) {
-  scoped_refptr<ContextProviderInProcess> provider =
-      new ContextProviderInProcess;
-  if (!provider->InitializeOnMainThread(create_callback))
+    scoped_ptr<WebGraphicsContext3DInProcessCommandBufferImpl> context3d) {
+  if (!context3d)
     return NULL;
-  return provider;
+  return new ContextProviderInProcess(context3d.Pass());
 }
 
-static scoped_ptr<WebGraphicsContext3DInProcessCommandBufferImpl>
-CreateOffscreenContext() {
+// static
+scoped_refptr<ContextProviderInProcess>
+ContextProviderInProcess::CreateOffscreen() {
   WebKit::WebGraphicsContext3D::Attributes attributes;
   attributes.depth = false;
   attributes.stencil = true;
   attributes.antialias = false;
   attributes.shareResources = true;
   attributes.noAutomaticFlushes = true;
 
-  return WebGraphicsContext3DInProcessCommandBufferImpl::CreateOffscreenContext(
-      attributes).Pass();
+  return Create(
+      WebGraphicsContext3DInProcessCommandBufferImpl::CreateOffscreenContext(
+          attributes));
 }
 
-// static
-scoped_refptr<ContextProviderInProcess>
-ContextProviderInProcess::CreateOffscreen() {
-  return Create(base::Bind(&CreateOffscreenContext));
-}
-
-ContextProviderInProcess::ContextProviderInProcess()
-    : destroyed_(false) {
+ContextProviderInProcess::ContextProviderInProcess(
+    scoped_ptr<WebGraphicsContext3DInProcessCommandBufferImpl> context3d)
+    : context3d_(context3d.Pass()),
+      destroyed_(false) {
   DCHECK(main_thread_checker_.CalledOnValidThread());
+  DCHECK(context3d_);
   context_thread_checker_.DetachFromThread();
 }
 
 ContextProviderInProcess::~ContextProviderInProcess() {
   DCHECK(main_thread_checker_.CalledOnValidThread() ||
          context_thread_checker_.CalledOnValidThread());
 }
 
-bool ContextProviderInProcess::InitializeOnMainThread(
-    const CreateCallback& create_callback) {
-  DCHECK(!context3d_);
-  DCHECK(main_thread_checker_.CalledOnValidThread());
-  DCHECK(!create_callback.is_null());
-
-  context3d_ = create_callback.Run();
-  return context3d_;
-}
-
 bool ContextProviderInProcess::BindToCurrentThread() {
   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 (!context3d_->makeContextCurrent())
@@ skipping 103 matching lines @@
 void ContextProviderInProcess::SetMemoryPolicyChangedCallback(
     const MemoryPolicyChangedCallback& memory_policy_changed_callback) {
   DCHECK(context_thread_checker_.CalledOnValidThread());
   DCHECK(memory_policy_changed_callback_.is_null() ||
          memory_policy_changed_callback.is_null());
   memory_policy_changed_callback_ = memory_policy_changed_callback;
 }
 
 }  // namespace gpu
 }  // namespace webkit