Hide WebGraphicsContext3DCommandBufferImpl.

content/common/gpu/client/context_provider_command_buffer.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/common/gpu/client/context_provider_command_buffer.h"
 
 #include <stddef.h>
 
 #include <memory>
 #include <set>
 #include <utility>
 #include <vector>
 
 #include "base/callback_helpers.h"
 #include "base/command_line.h"
 #include "base/strings/stringprintf.h"
 #include "cc/output/managed_memory_policy.h"
 #include "content/common/gpu/client/command_buffer_metrics.h"
+#include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h"
 #include "gpu/command_buffer/client/gles2_implementation.h"
 #include "gpu/command_buffer/client/gles2_trace_implementation.h"
 #include "gpu/command_buffer/client/gpu_switches.h"
+#include "gpu/ipc/client/gpu_channel_host.h"
 #include "gpu/skia_bindings/grcontext_for_gles2_interface.h"
 #include "third_party/skia/include/gpu/GrContext.h"
 
 namespace content {
 
 ContextProviderCommandBuffer::SharedProviders::SharedProviders() = default;
 ContextProviderCommandBuffer::SharedProviders::~SharedProviders() = default;
 
 ContextProviderCommandBuffer::ContextProviderCommandBuffer(
-    std::unique_ptr<WebGraphicsContext3DCommandBufferImpl> context3d,
+    scoped_refptr<gpu::GpuChannelHost> channel,
+    gpu::SurfaceHandle surface_handle,
+    const GURL& active_url,
+    gfx::GpuPreference gpu_preference,
+    bool automatic_flushes,
     const gpu::SharedMemoryLimits& memory_limits,
     const gpu::gles2::ContextCreationAttribHelper& attributes,
     ContextProviderCommandBuffer* shared_context_provider,
     command_buffer_metrics::ContextType type)
-    : shared_providers_(shared_context_provider
+    : surface_handle_(surface_handle),
+      active_url_(active_url),
+      gpu_preference_(gpu_preference),
+      automatic_flushes_(automatic_flushes),
+      memory_limits_(memory_limits),
+      attributes_(attributes),
+      context_type_(type),
+      shared_providers_(shared_context_provider
                             ? shared_context_provider->shared_providers_
                             : new SharedProviders),
-      context3d_(std::move(context3d)),
-      memory_limits_(memory_limits),
-      attributes_(attributes),
-      context_type_(type) {
+      channel_(std::move(channel)),
+      context3d_(new WebGraphicsContext3DCommandBufferImpl) {
   DCHECK(main_thread_checker_.CalledOnValidThread());
-  DCHECK(context3d_);
+  DCHECK(channel_);
   context_thread_checker_.DetachFromThread();
 }
 
 ContextProviderCommandBuffer::~ContextProviderCommandBuffer() {
   DCHECK(main_thread_checker_.CalledOnValidThread() ||
          context_thread_checker_.CalledOnValidThread());
 
   {
     base::AutoLock hold(shared_providers_->lock);
     auto it = std::find(shared_providers_->list.begin(),
@@ skipping 39 matching lines @@
 
     if (!shared_providers_->list.empty()) {
       shared_context_provider = shared_providers_->list.front();
       shared_command_buffer =
           shared_context_provider->context3d_->GetCommandBufferProxy();
       share_group = shared_context_provider->context3d_->GetImplementation()
                         ->share_group();
     }
 
     if (!context3d_->InitializeOnCurrentThread(
-            memory_limits_, shared_command_buffer, std::move(share_group),
-            attributes_, context_type_)) {
+            surface_handle_, active_url_, channel_.get(), gpu_preference_,

[piman, 2016/05/03 01:44:18]

We don't need channel_ after this point, and CommandBufferProxyImpl will keep a
reference. So we could std::move(channel_) ?

[danakj, 2016/05/03 01:56:18]

Well, all WGC3DCBImpl does with it is channel_->CreateCommandBuffer() so it's a
bit odd to pass a ref here to do that. I'm about to move the whole thing out
here, so how about we defer this until that point. Then we can drop the ref here
if you want.

+            automatic_flushes_, memory_limits_, shared_command_buffer,
+            std::move(share_group), attributes_, context_type_)) {

[piman, 2016/05/03 01:44:18]

mmh. This was true before, but we use share_group below. Maybe should stop
std::move'ing it?

[danakj, 2016/05/03 01:56:18]

Gah, yes thanks. We're not checking lost because of this.

       context3d_ = nullptr;
       return false;
     }
 
     // If any context in the share group has been lost, then abort and don't
     // continue since we need to go back to the caller of the constructor to
     // find the correct share group.
     // This may happen in between the share group being chosen at the
     // constructor, and getting to run this BindToCurrentThread method which
     // can be on some other thread.
@@ skipping 119 matching lines @@
 
 void ContextProviderCommandBuffer::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