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

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

Issue 11267035: Fix layering violation where content is included by gpu. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove NOTIMPLEMENTED entrypoints Created 8 years, 2 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 d25eb53c574a0d0dba67f49e6fff7cb23fa3dc57..489e43f0ca9f1029b6d6899ace306bef8d4bdf42 100644
--- a/content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h
+++ b/content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h
@@ -11,6 +11,7 @@
#include "base/callback.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
+#include "content/common/gpu/client/command_buffer_proxy_impl.h"
#include "content/common/gpu/gpu_process_launch_causes.h"
#include "googleurl/src/gurl.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebGraphicsContext3D.h"
@@ -23,7 +24,6 @@
#define FLIP_FRAMEBUFFER_VERTICALLY
#endif
-class CommandBufferProxy;
namespace gpu {
class TransferBuffer;
@@ -81,7 +81,7 @@ class WebGraphicsContext3DCommandBufferImpl
virtual ~WebGraphicsContext3DCommandBufferImpl();
void InitializeWithCommandBuffer(
- CommandBufferProxy* command_buffer,
+ CommandBufferProxyImpl* command_buffer,
const Attributes& attributes,
bool bind_generates_resources);
@@ -99,7 +99,7 @@ class WebGraphicsContext3DCommandBufferImpl
// Gets the context ID (relative to the channel).
int GetContextID();
- CommandBufferProxy* GetCommandBufferProxy() { return command_buffer_; }
+ CommandBufferProxyImpl* GetCommandBufferProxy() { return command_buffer_; }
gpu::gles2::GLES2Implementation* GetImplementation() { return gl_; }
@@ -719,7 +719,7 @@ class WebGraphicsContext3DCommandBufferImpl
bool initialized_;
WebGraphicsContext3DCommandBufferImpl* parent_;
uint32 parent_texture_id_;
- CommandBufferProxy* command_buffer_;
+ CommandBufferProxyImpl* command_buffer_;
gpu::gles2::GLES2CmdHelper* gles2_helper_;
gpu::TransferBuffer* transfer_buffer_;
gpu::gles2::GLES2Implementation* gl_;
« no previous file with comments | « content/common/gpu/client/gpu_channel_host.cc ('k') | content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698