Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(540)

Unified Diff: content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h

Issue 1827123002: Move content/common/gpu/client to gpu/ipc/client (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h
diff --git a/content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h b/content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h
index 9086cbfe3f7e4a64cdc0b1292bbb23b67c2016b9..1bbd7202eb6313e061af0524e4b568fc0c06e3ec 100644
--- a/content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h
+++ b/content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h
@@ -18,9 +18,9 @@
#include "base/synchronization/lock.h"
#include "content/common/content_export.h"
#include "content/common/gpu/client/command_buffer_metrics.h"
-#include "content/common/gpu/client/command_buffer_proxy_impl.h"
#include "gpu/blink/webgraphicscontext3d_impl.h"
#include "gpu/command_buffer/common/gles2_cmd_utils.h"
+#include "gpu/ipc/client/command_buffer_proxy_impl.h"
#include "gpu/ipc/common/surface_handle.h"
#include "third_party/WebKit/public/platform/WebGraphicsContext3D.h"
#include "third_party/WebKit/public/platform/WebString.h"
@@ -30,6 +30,7 @@
namespace gpu {
class ContextSupport;
+class GpuChannelHost;
class TransferBuffer;
namespace gles2 {
@@ -40,7 +41,6 @@ class GLES2Interface;
}
namespace content {
-class GpuChannelHost;
const size_t kDefaultCommandBufferSize = 1024 * 1024;
const size_t kDefaultStartTransferBufferSize = 1 * 1024 * 1024;
@@ -111,7 +111,7 @@ class 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,
@@ -121,7 +121,7 @@ class WebGraphicsContext3DCommandBufferImpl
~WebGraphicsContext3DCommandBufferImpl() override;
- CommandBufferProxyImpl* GetCommandBufferProxy() {
+ gpu::CommandBufferProxyImpl* GetCommandBufferProxy() {
return command_buffer_.get();
}
@@ -139,7 +139,7 @@ class WebGraphicsContext3DCommandBufferImpl
// on any failure.
static CONTENT_EXPORT WebGraphicsContext3DCommandBufferImpl*
CreateOffscreenContext(
- GpuChannelHost* host,
+ gpu::GpuChannelHost* host,
const gpu::gles2::ContextCreationAttribHelper& attributes,
gfx::GpuPreference gpu_preference,
bool share_resources,
@@ -197,14 +197,14 @@ class WebGraphicsContext3DCommandBufferImpl
gpu::gles2::ContextCreationAttribHelper attributes_;
// State needed by MaybeInitializeGL.
- scoped_refptr<GpuChannelHost> host_;
+ scoped_refptr<gpu::GpuChannelHost> host_;
gpu::SurfaceHandle surface_handle_;
GURL active_url_;
CommandBufferContextType context_type_;
gfx::GpuPreference gpu_preference_;
- scoped_ptr<CommandBufferProxyImpl> command_buffer_;
+ scoped_ptr<gpu::CommandBufferProxyImpl> command_buffer_;
scoped_ptr<gpu::gles2::GLES2CmdHelper> gles2_helper_;
scoped_ptr<gpu::TransferBuffer> transfer_buffer_;
scoped_ptr<gpu::gles2::GLES2Implementation> real_gl_;

Powered by Google App Engine
This is Rietveld 408576698