Move content/common/gpu/client to gpu/ipc/client

content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.cc

 // Copyright (c) 2012 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/webgraphicscontext3d_command_buffer_impl.h"
 
 #include "third_party/khronos/GLES2/gl2.h"
 #ifndef GL_GLEXT_PROTOTYPES
 #define GL_GLEXT_PROTOTYPES 1
 #endif
 #include "third_party/khronos/GLES2/gl2ext.h"
 
 #include <algorithm>
 #include <map>
 
 #include "base/atomicops.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram.h"
 #include "base/profiler/scoped_tracker.h"
 #include "base/trace_event/trace_event.h"
-#include "content/common/gpu/client/gpu_channel_host.h"
 #include "gpu/GLES2/gl2extchromium.h"
 #include "gpu/command_buffer/client/gles2_cmd_helper.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/command_buffer/client/transfer_buffer.h"
 #include "gpu/command_buffer/common/constants.h"
 #include "gpu/command_buffer/common/gpu_memory_allocation.h"
 #include "gpu/command_buffer/common/mailbox.h"
+#include "gpu/ipc/client/gpu_channel_host.h"
 #include "gpu/skia_bindings/gl_bindings_skia_cmd_buffer.h"
 #include "third_party/skia/include/core/SkTypes.h"
 
 namespace content {
 
 namespace {
 
 static base::LazyInstance<base::Lock>::Leaky
     g_default_share_groups_lock = LAZY_INSTANCE_INITIALIZER;
 
-typedef std::map<GpuChannelHost*,
-    scoped_refptr<WebGraphicsContext3DCommandBufferImpl::ShareGroup> >
+typedef std::map<
+    gpu::GpuChannelHost*,
+    scoped_refptr<WebGraphicsContext3DCommandBufferImpl::ShareGroup>>
     ShareGroupMap;
 static base::LazyInstance<ShareGroupMap> g_default_share_groups =
     LAZY_INSTANCE_INITIALIZER;
 
 scoped_refptr<WebGraphicsContext3DCommandBufferImpl::ShareGroup>
-    GetDefaultShareGroupForHost(GpuChannelHost* host) {
+GetDefaultShareGroupForHost(gpu::GpuChannelHost* host) {
   base::AutoLock lock(g_default_share_groups_lock.Get());
 
   ShareGroupMap& share_groups = g_default_share_groups.Get();
   ShareGroupMap::iterator it = share_groups.find(host);
   if (it == share_groups.end()) {
     scoped_refptr<WebGraphicsContext3DCommandBufferImpl::ShareGroup> group =
         new WebGraphicsContext3DCommandBufferImpl::ShareGroup();
     share_groups[host] = group;
     return group;
   }
@@ skipping 12 matching lines @@
 WebGraphicsContext3DCommandBufferImpl::ShareGroup::ShareGroup() {
 }
 
 WebGraphicsContext3DCommandBufferImpl::ShareGroup::~ShareGroup() {
   DCHECK(contexts_.empty());
 }
 
 WebGraphicsContext3DCommandBufferImpl::WebGraphicsContext3DCommandBufferImpl(
     gpu::SurfaceHandle surface_handle,
     const GURL& active_url,
-    GpuChannelHost* host,
+    gpu::GpuChannelHost* host,
     const gpu::gles2::ContextCreationAttribHelper& attributes,
     gfx::GpuPreference gpu_preference,
     bool share_resources,
     bool automatic_flushes,
     const SharedMemoryLimits& limits,
     WebGraphicsContext3DCommandBufferImpl* share_context)
     : automatic_flushes_(automatic_flushes),
       attributes_(attributes),
       host_(host),
       surface_handle_(surface_handle),
@@ skipping 63 matching lines @@
 
   initialized_ = true;
   return true;
 }
 
 bool WebGraphicsContext3DCommandBufferImpl::InitializeCommandBuffer(
     WebGraphicsContext3DCommandBufferImpl* share_context) {
   if (!host_.get())
     return false;
 
-  CommandBufferProxyImpl* share_group_command_buffer = NULL;
+  gpu::CommandBufferProxyImpl* share_group_command_buffer = NULL;
 
   if (share_context) {
     share_group_command_buffer = share_context->GetCommandBufferProxy();
   }
 
   DCHECK(attributes_.buffer_preserved);
   std::vector<int32_t> serialized_attributes;
   attributes_.Serialize(&serialized_attributes);
 
   // Create a proxy to a command buffer in the GPU process.
   command_buffer_ = host_->CreateCommandBuffer(
       surface_handle_, gfx::Size(), share_group_command_buffer,
-      GpuChannelHost::kDefaultStreamId, GpuChannelHost::kDefaultStreamPriority,
-      serialized_attributes, active_url_, gpu_preference_);
+      gpu::GpuChannelHost::kDefaultStreamId,
+      gpu::GpuChannelHost::kDefaultStreamPriority, serialized_attributes,
+      active_url_, gpu_preference_);
 
   if (!command_buffer_) {
     DLOG(ERROR) << "GpuChannelHost failed to create command buffer.";
     UmaRecordContextInitFailed(context_type_);
     return false;
   }
 
   DVLOG_IF(1, gpu::error::IsError(command_buffer_->GetLastError()))
       << "Context dead on arrival. Last error: "
       << command_buffer_->GetLastError();
@@ skipping 123 matching lines @@
   // command buffer's state.
   if (host_.get() && host_->IsLost())
     return true;
   gpu::CommandBuffer::State state = command_buffer_->GetLastState();
   return gpu::error::IsError(state.error);
 }
 
 // static
 WebGraphicsContext3DCommandBufferImpl*
 WebGraphicsContext3DCommandBufferImpl::CreateOffscreenContext(
-    GpuChannelHost* host,
+    gpu::GpuChannelHost* host,
     const gpu::gles2::ContextCreationAttribHelper& attributes,
     gfx::GpuPreference gpu_preference,
     bool share_resources,
     bool automatic_flushes,
     const GURL& active_url,
     const SharedMemoryLimits& limits,
     WebGraphicsContext3DCommandBufferImpl* share_context) {
   if (!host)
     return NULL;
 
@@ skipping 15 matching lines @@
   {
     base::AutoLock lock(g_default_share_groups_lock.Get());
     g_default_share_groups.Get().erase(host_.get());
   }
 
   gpu::CommandBuffer::State state = command_buffer_->GetLastState();
   UmaRecordContextLost(context_type_, state.error, state.context_lost_reason);
 }
 
 }  // namespace content