Add the necessary plumbing mechanisms to ensure proper WebGL support inside the <browser> tag, whic…

webkit/plugins/ppapi/ppb_graphics_3d_impl.cc

 // Copyright (c) 2012 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 "webkit/plugins/ppapi/ppb_graphics_3d_impl.h"
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "gpu/command_buffer/client/gles2_implementation.h"
+#include "gpu/ipc/command_buffer_proxy.h"
 #include "ppapi/c/ppp_graphics_3d.h"
+#include "ppapi/thunk/enter.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebConsoleMessage.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginContainer.h"
 #include "webkit/plugins/ppapi/plugin_module.h"
 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
 #include "webkit/plugins/ppapi/resource_helper.h"
 
+using ppapi::thunk::EnterResourceNoLock;
 using ppapi::thunk::PPB_Graphics3D_API;
 using WebKit::WebConsoleMessage;
 using WebKit::WebFrame;
 using WebKit::WebPluginContainer;
 using WebKit::WebString;
 
 namespace webkit {
 namespace ppapi {
 
 namespace {
@@ skipping 178 matching lines @@
 
   return CreateGLES2Impl(kCommandBufferSize, kTransferBufferSize);
 }
 
 bool PPB_Graphics3D_Impl::InitRaw(PP_Resource share_context,
                                   const int32_t* attrib_list) {
   PluginInstance* plugin_instance = ResourceHelper::GetPluginInstance(this);
   if (!plugin_instance)
     return false;
 
-  // TODO(alokp): Support shared context.
-  DCHECK_EQ(0, share_context);
-  if (share_context != 0)
-    return false;
+  CommandBufferProxy *share_buffer = 0;
+  if (share_context != 0) {
+    EnterResourceNoLock<PPB_Graphics3D_API> enter(share_context, false);

[piman, 2012/05/15 20:59:17]

It'd be nicer to do the EnterResource thing in the thunk layer

[(scshunt), 2012/05/16 16:39:43]

Which is the thunk layer?

[piman, 2012/05/16 17:12:00]

ppapi/thunk/ppb_graphics_3d_thunk.cc

+    DCHECK(enter.succeeded());
+    PPB_Graphics3D_Impl* graphics3d_impl =
+      static_cast<PPB_Graphics3D_Impl*>(enter.object());
+    share_buffer =
+      static_cast<CommandBufferProxy*>(graphics3d_impl->GetCommandBuffer());
+  }
 
   platform_context_.reset(plugin_instance->CreateContext3D());
   if (!platform_context_.get())
     return false;
 
-  if (!platform_context_->Init(attrib_list))
+  if (!platform_context_->Init(attrib_list, share_buffer))
     return false;
 
   platform_context_->SetContextLostCallback(
       base::Bind(&PPB_Graphics3D_Impl::OnContextLost,
                  weak_ptr_factory_.GetWeakPtr()));
 
   platform_context_->SetOnConsoleMessageCallback(
       base::Bind(&PPB_Graphics3D_Impl::OnConsoleMessage,
                  weak_ptr_factory_.GetWeakPtr()));
   return true;
@@ skipping 47 matching lines @@
   const PPP_Graphics3D* ppp_graphics_3d =
       static_cast<const PPP_Graphics3D*>(
           instance->module()->GetPluginInterface(
               PPP_GRAPHICS_3D_INTERFACE));
   if (ppp_graphics_3d)
     ppp_graphics_3d->Graphics3DContextLost(pp_instance());
 }
 
 }  // namespace ppapi
 }  // namespace webkit