Progress towards fixing 77536

content/renderer/renderer_gl_context.cc

Index: content/renderer/renderer_gl_context.cc
diff --git a/content/renderer/renderer_gl_context.cc b/content/renderer/renderer_gl_context.cc
index f913a3b8a280e26426fdedf3bdc983774d8595eb..db4d2495fb653e75ab2976c8cf91f0aa29c34e8f 100644
--- a/content/renderer/renderer_gl_context.cc
+++ b/content/renderer/renderer_gl_context.cc
@@ -156,6 +156,7 @@ RendererGLContext::~RendererGLContext() {
 
 RendererGLContext* RendererGLContext::CreateViewContext(
     GpuChannelHost* channel,
+    gfx::PluginWindowHandle render_surface,
     int render_view_id,
     const char* allowed_extensions,
     const int32* attrib_list,
@@ -164,6 +165,7 @@ RendererGLContext* RendererGLContext::CreateViewContext(
   scoped_ptr<RendererGLContext> context(new RendererGLContext(channel, NULL));
   if (!context->Initialize(
       true,
+      render_surface,
       render_view_id,
       gfx::Size(),
       allowed_extensions,
@@ -196,6 +198,7 @@ RendererGLContext* RendererGLContext::CreateOffscreenContext(
   scoped_ptr<RendererGLContext> context(new RendererGLContext(channel, parent));
   if (!context->Initialize(
       false,
+      gfx::kNullPluginWindow,
       0,
       size,
       allowed_extensions,
@@ -366,6 +369,7 @@ RendererGLContext::RendererGLContext(GpuChannelHost* channel,
 }
 
 bool RendererGLContext::Initialize(bool onscreen,
+                                   gfx::PluginWindowHandle render_surface,
                                    int render_view_id,
                                    const gfx::Size& size,
                                    const char* allowed_extensions,
@@ -418,7 +422,9 @@ bool RendererGLContext::Initialize(bool onscreen,
 
   // Create a proxy to a command buffer in the GPU process.
   if (onscreen) {
+    DCHECK_NE(render_surface, gfx::kNullPluginWindow);
     command_buffer_ = channel_->CreateViewCommandBuffer(
+        render_surface,
         render_view_id,
         allowed_extensions,
         attribs,