Allow both Context3D and Graphics3D with the video decoder

ppapi/proxy/ppb_video_decoder_proxy.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 "ppapi/proxy/ppb_video_decoder_proxy.h"
 
 #include "base/logging.h"
 #include "gpu/command_buffer/client/gles2_implementation.h"
 #include "ppapi/proxy/enter_proxy.h"
 #include "ppapi/proxy/plugin_dispatcher.h"
 #include "ppapi/proxy/ppapi_messages.h"
 #include "ppapi/proxy/ppb_buffer_proxy.h"
 #include "ppapi/proxy/ppb_context_3d_proxy.h"
+#include "ppapi/proxy/ppb_graphics_3d_proxy.h"
 #include "ppapi/thunk/enter.h"
 #include "ppapi/thunk/resource_creation_api.h"
 #include "ppapi/thunk/thunk.h"
 
 using ppapi::thunk::EnterResourceNoLock;
 using ppapi::thunk::PPB_Buffer_API;
 using ppapi::thunk::PPB_Context3D_API;
+using ppapi::thunk::PPB_Graphics3D_API;
 using ppapi::thunk::PPB_VideoDecoder_API;
 
 namespace ppapi {
 namespace proxy {
 
 class VideoDecoder : public Resource, public VideoDecoderImpl {
  public:
   // You must call Init() before using this class.
   explicit VideoDecoder(const HostResource& resource);
   virtual ~VideoDecoder();
@@ skipping 180 matching lines @@
   PluginDispatcher* dispatcher = PluginDispatcher::GetForInstance(instance);
   // Dispatcher is null if it cannot find the instance passed to it (i.e. if the
   // client passes in an invalid instance).
   if (!dispatcher)
     return 0;
 
   std::vector<PP_VideoConfigElement> copied;
   if (!VideoDecoderImpl::CopyConfigsToVector(config, &copied))
     return 0;
 
-  EnterResourceNoLock<PPB_Context3D_API> enter_context(context3d_id, true);
-  if (enter_context.failed())
-    return 0;
-  Context3D* ppb_context =
-      static_cast<Context3D*>(enter_context.object());
-  HostResource host_context = ppb_context->host_resource();
+  HostResource host_context;
+  gpu::gles2::GLES2Implementation* gles2_impl = NULL;
+
+  EnterResourceNoLock<PPB_Context3D_API> enter_context(context3d_id, false);
+  if (enter_context.succeeded()) {
+    Context3D* context = static_cast<Context3D*>(enter_context.object());
+    host_context = context->host_resource();
+    gles2_impl = context->gles2_impl();
+  } else {
+    EnterResourceNoLock<PPB_Graphics3D_API> enter_context(context3d_id, true);

[vrk (LEFT CHROMIUM), 2011/08/29 16:56:41]

nit: "context3d_id" is a bit of a misleading name for this argument now, as the
identifier may be referring to a Graphics3D resource instead of a Context3D
resource. 

Rename to something more general here and elsewhere (including shared_impl and
webkit)? Up to you.

[piman, 2011/08/29 19:58:57]

I renamed to graphics_context. I really want to name it 3d_context, but that's
not a valid identifier name.

+    if (enter_context.failed())
+      return 0;
+    Graphics3D* context = static_cast<Graphics3D*>(enter_context.object());
+    host_context = context->host_resource();
+    gles2_impl = context->gles2_impl();
+  }
 
   HostResource result;
   dispatcher->Send(new PpapiHostMsg_PPBVideoDecoder_Create(
       INTERFACE_ID_PPB_VIDEO_DECODER_DEV, instance,
       host_context, copied, &result));
   if (result.is_null())
     return 0;
 
   // Need a scoped_refptr to keep the object alive during the Init call.
   scoped_refptr<VideoDecoder> decoder(new VideoDecoder(result));
-  if (!decoder->Init(context3d_id, enter_context.object(), config))
-    return 0;
+  decoder->InitCommon(context3d_id, gles2_impl);
   return decoder->GetReference();
 }
 
 void PPB_VideoDecoder_Proxy::OnMsgCreate(
     PP_Instance instance, const HostResource& context3d_id,
     const std::vector<PP_VideoConfigElement>& config,
     HostResource* result) {
   thunk::EnterFunction<thunk::ResourceCreationAPI> resource_creation(instance,
                                                                      true);
   if (resource_creation.failed())
@@ skipping 87 matching lines @@
 
 void PPB_VideoDecoder_Proxy::OnMsgResetACK(
     const HostResource& decoder, int32_t result) {
   EnterPluginFromHostResource<PPB_VideoDecoder_API> enter(decoder);
   if (enter.succeeded())
     static_cast<VideoDecoder*>(enter.object())->ResetACK(result);
 }
 
 }  // namespace proxy
 }  // namespace ppapi