diff options
| author | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-21 21:31:53 +0000 |
|---|---|---|
| committer | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-21 21:31:53 +0000 |
| commit | 96f8063420f0170207f8b8fad211c70d3ad66db6 (patch) | |
| tree | ecd625784f6ccf6a699f51a888e7e70056ab4bc0 /gpu/command_buffer/service/gpu_processor.h | |
| parent | d3d0ef9739170a270dcb2f070f2364aa003aea9c (diff) | |
| download | chromium_src-96f8063420f0170207f8b8fad211c70d3ad66db6.zip chromium_src-96f8063420f0170207f8b8fad211c70d3ad66db6.tar.gz chromium_src-96f8063420f0170207f8b8fad211c70d3ad66db6.tar.bz2 | |
Revert 45240 - Moved GLContext class to gfx/gl.
Now it can be used by code outside of the gpu project, for example AcceleratedSurface.
TEST=trybots
BUG=none
Review URL: http://codereview.chromium.org/1694003
TBR=jamesr@chromium.org
Review URL: http://codereview.chromium.org/1747007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45244 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/command_buffer/service/gpu_processor.h')
| -rw-r--r-- | gpu/command_buffer/service/gpu_processor.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/gpu/command_buffer/service/gpu_processor.h b/gpu/command_buffer/service/gpu_processor.h index 47164cd..eb2d52b 100644 --- a/gpu/command_buffer/service/gpu_processor.h +++ b/gpu/command_buffer/service/gpu_processor.h @@ -23,12 +23,10 @@ #include "app/surface/accelerated_surface_mac.h" #endif -namespace gfx { -class GLContext; -} - namespace gpu { +class GLContext; + // This class processes commands in a command buffer. It is event driven and // posts tasks to the current message loop to do additional work. class GPUProcessor : public CommandBufferEngine { @@ -101,7 +99,7 @@ class GPUProcessor : public CommandBufferEngine { gles2::ContextGroup group_; scoped_ptr<gles2::GLES2Decoder> decoder_; scoped_ptr<CommandParser> parser_; - scoped_ptr<gfx::GLContext> context_; + scoped_ptr<GLContext> context_; #if defined(OS_MACOSX) && !defined(UNIT_TEST) scoped_ptr<AcceleratedSurface> surface_; |