Convert most remaining resources to use the API/thunk system. The significant

webkit/plugins/ppapi/ppb_video_decoder_impl.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 "webkit/plugins/ppapi/ppb_video_decoder_impl.h"
 
 #include <string>
 
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "media/video/picture.h"
 #include "ppapi/c/dev/pp_video_dev.h"
 #include "ppapi/c/dev/ppb_video_decoder_dev.h"
 #include "ppapi/c/dev/ppp_video_decoder_dev.h"
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/thunk/enter.h"
 #include "webkit/plugins/ppapi/common.h"
 #include "webkit/plugins/ppapi/plugin_module.h"
 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
 #include "webkit/plugins/ppapi/ppb_buffer_impl.h"
 #include "webkit/plugins/ppapi/ppb_context_3d_impl.h"
 #include "webkit/plugins/ppapi/resource_tracker.h"
 #include "webkit/plugins/ppapi/var.h"
 
+using ppapi::thunk::EnterResourceNoLock;
+using ppapi::thunk::PPB_Buffer_API;
+using ppapi::thunk::PPB_Context3D_API;
 using ppapi::thunk::PPB_VideoDecoder_API;
 
 namespace webkit {
 namespace ppapi {
 
 namespace {
 
 // Utility methods to convert data to and from the ppapi C-types and their
 // C++ media-namespace equivalents.
 void CopyToPictureDev(const media::Picture& input, PP_Picture_Dev* output) {
@@ skipping 79 matching lines @@
 int32_t PPB_VideoDecoder_Impl::Initialize(
     PP_Resource context_id,
     const PP_VideoConfigElement* decoder_config,
     PP_CompletionCallback callback) {
   if (!callback.func)
     return PP_ERROR_BADARGUMENT;
 
   if (!instance())
     return PP_ERROR_FAILED;
 
-  scoped_refptr<webkit::ppapi::PPB_Context3D_Impl> context3d =
-      webkit::ppapi::Resource::GetAs<webkit::ppapi::PPB_Context3D_Impl>(
-          context_id);
-  if (!context3d)
+  EnterResourceNoLock<PPB_Context3D_API> enter(context_id, true);
+  if (enter.failed())
     return PP_ERROR_BADRESOURCE;
+  PPB_Context3D_Impl* context3d =
+      static_cast<PPB_Context3D_Impl*>(enter.object());
 
   int command_buffer_route_id =
       context3d->platform_context()->GetCommandBufferRouteId();
   if (command_buffer_route_id == 0)
     return PP_ERROR_FAILED;
 
   platform_video_decoder_.reset(
       instance()->delegate()->CreateVideoDecoder(
           this, command_buffer_route_id));
 
@@ skipping 10 matching lines @@
     return PP_ERROR_FAILED;
   }
 }
 
 int32_t PPB_VideoDecoder_Impl::Decode(
     const PP_VideoBitstreamBuffer_Dev* bitstream_buffer,
     PP_CompletionCallback callback) {
   if (!platform_video_decoder_.get())
     return PP_ERROR_BADRESOURCE;
 
-  ::ppapi::thunk::EnterResourceNoLock< ::ppapi::thunk::PPB_Buffer_API>
-      enter(bitstream_buffer->data, true);
+  EnterResourceNoLock<PPB_Buffer_API> enter(bitstream_buffer->data, true);
   if (enter.failed())
     return PP_ERROR_FAILED;
 
   PPB_Buffer_Impl* buffer = static_cast<PPB_Buffer_Impl*>(enter.object());
   media::BitstreamBuffer decode_buffer(bitstream_buffer->id,
                                        buffer->shared_memory()->handle(),
                                        static_cast<size_t>(buffer->size()));
 
   // Store the callback to inform when bitstream buffer has been processed.
   // TODO(vmr): handle simultaneous decodes + callbacks.
@@ skipping 175 matching lines @@
       size_(info.size.width, info.size.height) {
 }
 
 GLESBuffer::GLESBuffer(const PP_GLESBuffer_Dev& buffer)
     : BaseBuffer(buffer.info),
       texture_id_(buffer.texture_id) {
 }
 
 SysmemBuffer::SysmemBuffer(const PP_SysmemBuffer_Dev& buffer)
     : BaseBuffer(buffer.info) {
-  scoped_refptr<webkit::ppapi::PPB_Buffer_Impl> pepper_buffer =
-      webkit::ppapi::Resource::GetAs<webkit::ppapi::PPB_Buffer_Impl>(
-          buffer.data);
+  // TODO(brettw) we should properly handle the errors here if the buffer
+  // isn't a valid image rather than CHECKing.
+  EnterResourceNoLock<PPB_Buffer_API> enter(buffer.data, true);
+  CHECK(enter.succeeded());
+  webkit::ppapi::PPB_Buffer_Impl* pepper_buffer =
+      static_cast<webkit::ppapi::PPB_Buffer_Impl*>(enter.object());
   CHECK(pepper_buffer->IsMapped());
   data_ = pepper_buffer->Map();
 }
 
 Picture::Picture(const PP_Picture_Dev& picture)
     : picture_buffer_id_(picture.picture_buffer_id),
       bitstream_buffer_id_(picture.bitstream_buffer_id),
       visible_size_(picture.visible_size.width, picture.visible_size.height),
       decoded_size_(picture.decoded_size.width, picture.decoded_size.height) {
 }
 
 }  // namespace media