Index: content/renderer/gpu/renderer_gl_context.cc |
diff --git a/content/renderer/gpu/renderer_gl_context.cc b/content/renderer/gpu/renderer_gl_context.cc |
index 3000028fcae1faac2eea9f82536799589e7369eb..cd68151bb472eb4ea4341ac39010f85cb9f657e4 100644 |
--- a/content/renderer/gpu/renderer_gl_context.cc |
+++ b/content/renderer/gpu/renderer_gl_context.cc |
@@ -19,6 +19,7 @@ |
#include "googleurl/src/gurl.h" |
#include "ipc/ipc_channel_handle.h" |
jonathan.backer
2012/01/16 19:47:26
nit: extra \n
piman
2012/01/17 19:40:54
Done.
|
+ |
#if defined(ENABLE_GPU) |
#include "gpu/command_buffer/client/gles2_cmd_helper.h" |
#include "gpu/command_buffer/client/gles2_implementation.h" |
@@ -79,7 +80,7 @@ RendererGLContext::~RendererGLContext() { |
RendererGLContext* RendererGLContext::CreateViewContext( |
GpuChannelHost* channel, |
- int render_view_id, |
+ int32 surface_id, |
RendererGLContext* share_group, |
const char* allowed_extensions, |
const int32* attrib_list, |
@@ -89,7 +90,7 @@ RendererGLContext* RendererGLContext::CreateViewContext( |
scoped_ptr<RendererGLContext> context(new RendererGLContext(channel)); |
if (!context->Initialize( |
true, |
- render_view_id, |
+ surface_id, |
gfx::Size(), |
share_group, |
allowed_extensions, |
@@ -289,7 +290,7 @@ RendererGLContext::RendererGLContext(GpuChannelHost* channel) |
} |
bool RendererGLContext::Initialize(bool onscreen, |
- int render_view_id, |
+ int32 surface_id, |
const gfx::Size& size, |
RendererGLContext* share_group, |
const char* allowed_extensions, |
@@ -348,7 +349,7 @@ bool RendererGLContext::Initialize(bool onscreen, |
TRACE_EVENT0("gpu", |
"RendererGLContext::Initialize::CreateViewCommandBuffer"); |
command_buffer_ = channel_->CreateViewCommandBuffer( |
- render_view_id, |
+ surface_id, |
share_group ? share_group->command_buffer_ : NULL, |
allowed_extensions, |
attribs, |