Progress towards fixing 77536

content/renderer/renderer_gl_context.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/renderer_gl_context.h"
 
 #include "base/lazy_instance.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/singleton.h"
@@ skipping 138 matching lines @@
     base::LINKER_INITIALIZED);
 
 }  // namespace anonymous
 
 RendererGLContext::~RendererGLContext() {
   Destroy();
 }
 
 RendererGLContext* RendererGLContext::CreateViewContext(
     GpuChannelHost* channel,
+    gfx::PluginWindowHandle render_surface,
     int render_view_id,
     const char* allowed_extensions,
     const int32* attrib_list,
     const GURL& active_url) {
 #if defined(ENABLE_GPU)
   scoped_ptr<RendererGLContext> context(new RendererGLContext(channel, NULL));
   if (!context->Initialize(
       true,
+      render_surface,
       render_view_id,
       gfx::Size(),
       allowed_extensions,
       attrib_list,
       active_url))
     return NULL;
 
   return context.release();
 #else
   return NULL;
@@ skipping 12 matching lines @@
     GpuChannelHost* channel,
     RendererGLContext* parent,
     const gfx::Size& size,
     const char* allowed_extensions,
     const int32* attrib_list,
     const GURL& active_url) {
 #if defined(ENABLE_GPU)
   scoped_ptr<RendererGLContext> context(new RendererGLContext(channel, parent));
   if (!context->Initialize(
       false,
+      gfx::kNullPluginWindow,
       0,
       size,
       allowed_extensions,
       attrib_list,
       active_url))
     return NULL;
 
   return context.release();
 #else
   return NULL;
@@ skipping 150 matching lines @@
       latch_transfer_buffer_id_(-1),
       command_buffer_(NULL),
       gles2_helper_(NULL),
       transfer_buffer_id_(-1),
       gles2_implementation_(NULL),
       last_error_(SUCCESS) {
   DCHECK(channel);
 }
 
 bool RendererGLContext::Initialize(bool onscreen,
+                                   gfx::PluginWindowHandle render_surface,
                                    int render_view_id,
                                    const gfx::Size& size,
                                    const char* allowed_extensions,
                                    const int32* attrib_list,
                                    const GURL& active_url) {
   DCHECK(size.width() >= 0 && size.height() >= 0);
 
   if (channel_->state() != GpuChannelHost::kConnected)
     return false;
 
@@ skipping 32 matching lines @@
       default:
         last_error_ = BAD_ATTRIBUTE;
         attribs.push_back(NONE);
         attrib_list = NULL;
         break;
     }
   }
 
   // Create a proxy to a command buffer in the GPU process.
   if (onscreen) {
-    command_buffer_ = channel_->CreateViewCommandBuffer(
-        render_view_id,
-        allowed_extensions,
-        attribs,
-        active_url);
+    if (render_surface == gfx::kNullPluginWindow) {
+      LOG(ERROR) << "Invalid surface handle for onscreen context.";
+      command_buffer_ = NULL;
+    } else {
+      command_buffer_ = channel_->CreateViewCommandBuffer(
+          render_surface,
+          render_view_id,
+          allowed_extensions,
+          attribs,
+          active_url);
+    }
   } else {
     CommandBufferProxy* parent_command_buffer =
         parent_.get() ? parent_->command_buffer_ : NULL;
     command_buffer_ = channel_->CreateOffscreenCommandBuffer(
         parent_command_buffer,
         size,
         allowed_extensions,
         attribs,
         parent_texture_id_,
         active_url);
@@ skipping 138 matching lines @@
 }
 
 bool RendererGLContext::GetChildToParentLatch(uint32* child_to_parent_latch) {
   if (parent_.get()) {
     *child_to_parent_latch = child_to_parent_latch_;
     return true;
   }
   return false;
 }