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();
 
   static VideoDecoder* Create(const HostResource& resource,
-                              PP_Resource context3d_id,
+                              PP_Resource graphics_context,
                               const PP_VideoConfigElement* config);
 
   // Resource overrides.
   virtual PPB_VideoDecoder_API* AsPPB_VideoDecoder_API() OVERRIDE;
 
   // PPB_VideoDecoder_API implementation.
   virtual int32_t Decode(const PP_VideoBitstreamBuffer_Dev* bitstream_buffer,
                          PP_CompletionCallback callback) OVERRIDE;
   virtual void AssignPictureBuffers(
       uint32_t no_of_buffers, const PP_PictureBuffer_Dev* buffers) OVERRIDE;
@@ skipping 155 matching lines @@
     IPC_MESSAGE_HANDLER(PpapiMsg_PPBVideoDecoder_EndOfBitstreamACK,
                         OnMsgEndOfBitstreamACK)
     IPC_MESSAGE_HANDLER(PpapiMsg_PPBVideoDecoder_FlushACK, OnMsgFlushACK)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   DCHECK(handled);
   return handled;
 }
 
 PP_Resource PPB_VideoDecoder_Proxy::CreateProxyResource(
-    PP_Instance instance, PP_Resource context3d_id,
+    PP_Instance instance,
+    PP_Resource graphics_context,
     const PP_VideoConfigElement* config) {
   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(graphics_context, 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(graphics_context,
+                                                          true);
+    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(graphics_context, gles2_impl);
   return decoder->GetReference();
 }
 
 void PPB_VideoDecoder_Proxy::OnMsgCreate(
-    PP_Instance instance, const HostResource& context3d_id,
+    PP_Instance instance, const HostResource& graphics_context,
     const std::vector<PP_VideoConfigElement>& config,
     HostResource* result) {
   thunk::EnterFunction<thunk::ResourceCreationAPI> resource_creation(instance,
                                                                      true);
   if (resource_creation.failed())
     return;
 
   std::vector<PP_VideoConfigElement> copied = config;
   copied.push_back(PP_VIDEOATTR_DICTIONARY_TERMINATOR);
 
   // Make the resource and get the API pointer to its interface.
   result->SetHostResource(
       instance, resource_creation.functions()->CreateVideoDecoder(
-          instance, context3d_id.host_resource(), &copied.front()));
+          instance, graphics_context.host_resource(), &copied.front()));
 }
 
 void PPB_VideoDecoder_Proxy::OnMsgDecode(
     const HostResource& decoder,
     const HostResource& buffer, int32 id, int32 size) {
   pp::CompletionCallback callback = callback_factory_.NewRequiredCallback(
       &PPB_VideoDecoder_Proxy::SendMsgEndOfBitstreamACKToPlugin, decoder, id);
 
   PP_VideoBitstreamBuffer_Dev bitstream = { id, buffer.host_resource(), size };
   ppb_video_decoder_target()->Decode(
      decoder.host_resource(), &bitstream, callback.pp_completion_callback());
 }
 
 void PPB_VideoDecoder_Proxy::OnMsgAssignPictureBuffers(
     const HostResource& decoder,
     const std::vector<PP_PictureBuffer_Dev>& buffers) {
   DCHECK(!buffers.empty());
   const PP_PictureBuffer_Dev* buffer_array = &buffers.front();
 
   ppb_video_decoder_target()->AssignPictureBuffers(
-     decoder.host_resource(), buffers.size(), buffer_array);
+      decoder.host_resource(), buffers.size(), buffer_array);
 }
 
 void PPB_VideoDecoder_Proxy::OnMsgReusePictureBuffer(
     const HostResource& decoder, int32 picture_buffer_id) {
   ppb_video_decoder_target()->ReusePictureBuffer(
       decoder.host_resource(), picture_buffer_id);
 }
 
 void PPB_VideoDecoder_Proxy::OnMsgFlush(const HostResource& decoder) {
   pp::CompletionCallback callback = callback_factory_.NewRequiredCallback(
@@ skipping 47 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