diff options
| author | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-12 19:51:22 +0000 |
|---|---|---|
| committer | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-12 19:51:22 +0000 |
| commit | 9193034b79e3dea131a859e136302cf5ec3e44ff (patch) | |
| tree | cc0250a101b32c945172ae4108e1ad1b26474a37 /content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h | |
| parent | 6dfa3014196eb06386074ea2a15906921ce12e4f (diff) | |
| download | chromium_src-9193034b79e3dea131a859e136302cf5ec3e44ff.zip chromium_src-9193034b79e3dea131a859e136302cf5ec3e44ff.tar.gz chromium_src-9193034b79e3dea131a859e136302cf5ec3e44ff.tar.bz2 | |
Fix --single-process mode issues with GpuChannelHostFactory
GpuChannelHostFactory itself is no longer a singleton, we pass it explicitly to
WebGraphicsContext3DCommandBufferImpl. That prevents RenderThreadImpl and
BrowserGpuChannelHostFactory from stomping on each other in --single-process
mode
BUG=117594
TEST=see bug
Review URL: http://codereview.chromium.org/9667012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126194 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h')
| -rw-r--r-- | content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h b/content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h index 31a5c81..7b0755b 100644 --- a/content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h +++ b/content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h @@ -24,6 +24,7 @@ #endif class GpuChannelHost; +class GpuChannelHostFactory; namespace gpu { namespace gles2 { @@ -61,6 +62,7 @@ class WebGraphicsContext3DCommandBufferImpl WebGraphicsContext3DCommandBufferImpl( int surface_id, const GURL& active_url, + GpuChannelHostFactory* factory, const base::WeakPtr<WebGraphicsContext3DSwapBuffersClient>& swap_client); virtual ~WebGraphicsContext3DCommandBufferImpl(); @@ -509,6 +511,9 @@ class WebGraphicsContext3DCommandBufferImpl bool initialize_failed_; + // The channel factory to talk to the GPU process + GpuChannelHostFactory* factory_; + // The context we use for OpenGL rendering. ContentGLContext* context_; // The GLES2Implementation we use for OpenGL rendering. |