gpu_messages.h => gpu/ipc/common

content/common/gpu/client/gpu_channel_host.h

 // 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.
 
 #ifndef CONTENT_COMMON_GPU_CLIENT_GPU_CHANNEL_HOST_H_
 #define CONTENT_COMMON_GPU_CLIENT_GPU_CHANNEL_HOST_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <string>
 #include <vector>
 
 #include "base/atomic_sequence_num.h"
 #include "base/containers/scoped_ptr_hash_map.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/process/process.h"
 #include "base/synchronization/lock.h"
 #include "content/common/content_export.h"
 #include "content/common/gpu/gpu_process_launch_causes.h"
-#include "content/common/gpu/gpu_stream_constants.h"
 #include "gpu/config/gpu_info.h"
+#include "gpu/ipc/common/gpu_stream_constants.h"
 #include "gpu/ipc/common/surface_handle.h"
 #include "ipc/ipc_channel_handle.h"
 #include "ipc/ipc_sync_channel.h"
 #include "ipc/message_filter.h"
 #include "ipc/message_router.h"
 #include "ui/events/latency_info.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/gpu_memory_buffer.h"
 #include "ui/gl/gpu_preference.h"
 
@@ skipping 34 matching lines @@
  public:
   // Must be called on the main thread (as defined by the factory).
   static scoped_refptr<GpuChannelHost> Create(
       GpuChannelHostFactory* factory,
       int channel_id,
       const gpu::GPUInfo& gpu_info,
       const IPC::ChannelHandle& channel_handle,
       base::WaitableEvent* shutdown_event,
       gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager);
 
-  static const int32_t kDefaultStreamId = GPU_STREAM_DEFAULT;
-  static const GpuStreamPriority kDefaultStreamPriority =
-      GpuStreamPriority::NORMAL;
+  static const int32_t kDefaultStreamId = gpu::GPU_STREAM_DEFAULT;
+  static const gpu::GpuStreamPriority kDefaultStreamPriority =
+      gpu::GpuStreamPriority::NORMAL;
 
   bool IsLost() const {
     DCHECK(channel_filter_.get());
     return channel_filter_->IsLost();
   }
 
   int channel_id() const { return channel_id_; }
 
   // The GPU stats reported by the GPU process.
   const gpu::GPUInfo& gpu_info() const { return gpu_info_; }
@@ skipping 13 matching lines @@
                            bool do_flush);
 
   void FlushPendingStream(int32_t stream_id);
 
   // Create and connect to a command buffer in the GPU process.
   scoped_ptr<CommandBufferProxyImpl> CreateCommandBuffer(
       gpu::SurfaceHandle surface_handle,
       const gfx::Size& size,
       CommandBufferProxyImpl* share_group,
       int32_t stream_id,
-      GpuStreamPriority stream_priority,
+      gpu::GpuStreamPriority stream_priority,
       const std::vector<int32_t>& attribs,
       const GURL& active_url,
       gfx::GpuPreference gpu_preference);
 
   // Destroy a command buffer created by this channel.
   void DestroyCommandBuffer(CommandBufferProxyImpl* command_buffer);
 
   // Destroy this channel. Must be called on the main thread, before
   // destruction.
   void DestroyChannel();
@@ skipping 164 matching lines @@
   mutable base::Lock context_lock_;
   scoped_ptr<IPC::SyncChannel> channel_;
   base::hash_map<int32_t, StreamFlushInfo> stream_flush_info_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuChannelHost);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_GPU_CLIENT_GPU_CHANNEL_HOST_H_