PPB_VideoDecoder_Dev::Initialize is now synchronous!

webkit/plugins/ppapi/ppb_video_decoder_impl.h

 // 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.
 
 #ifndef WEBKIT_PLUGINS_PPAPI_PPB_VIDEO_DECODER_IMPL_H_
 #define WEBKIT_PLUGINS_PPAPI_PPB_VIDEO_DECODER_IMPL_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 20 matching lines @@
 
 namespace webkit {
 namespace ppapi {
 
 class PluginInstance;
 
 class PPB_VideoDecoder_Impl : public Resource,
                               public ::ppapi::thunk::PPB_VideoDecoder_API,
                               public media::VideoDecodeAccelerator::Client {
  public:
-  explicit PPB_VideoDecoder_Impl(PluginInstance* instance);
   virtual ~PPB_VideoDecoder_Impl();
+  // See PPB_VideoDecoder_Dev::Create.  Returns 0 on failure to create &
+  // initialize.
+  static PP_Resource Create(PluginInstance* instance,
+                            PP_Resource context3d_id,
+                            const PP_VideoConfigElement* config);
 
   // ResourceObjectBase overrides.
   virtual PPB_VideoDecoder_API* AsPPB_VideoDecoder_API() OVERRIDE;
 
   // PPB_VideoDecoder_API implementation.
-  virtual int32_t Initialize(PP_Resource context_id,
-                             const PP_VideoConfigElement* dec_config,
-                             PP_CompletionCallback callback) OVERRIDE;
   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;
   virtual void ReusePictureBuffer(int32_t picture_buffer_id) OVERRIDE;
   virtual int32_t Flush(PP_CompletionCallback callback) OVERRIDE;
   virtual int32_t Reset(PP_CompletionCallback callback) OVERRIDE;
   virtual void Destroy() OVERRIDE;
 
   // media::VideoDecodeAccelerator::Client implementation.
   virtual void ProvidePictureBuffers(
       uint32 requested_num_of_buffers, const gfx::Size& dimensions) OVERRIDE;
   virtual void DismissPictureBuffer(int32 picture_buffer_id) OVERRIDE;
   virtual void PictureReady(const media::Picture& picture) OVERRIDE;
   virtual void NotifyInitializeDone() OVERRIDE;
   virtual void NotifyEndOfStream() OVERRIDE;
   virtual void NotifyError(
       media::VideoDecodeAccelerator::Error error) OVERRIDE;
   virtual void NotifyFlushDone() OVERRIDE;
   virtual void NotifyEndOfBitstreamBuffer(int32 buffer_id) OVERRIDE;
   virtual void NotifyResetDone() OVERRIDE;
 
  private:
   // Key: bitstream_buffer_id, value: callback to run when bitstream decode is
   // done.
   typedef std::map<int32, PP_CompletionCallback> CallbackById;
 
+  explicit PPB_VideoDecoder_Impl(PluginInstance* instance);
+
+  // Initialize the underlying decoder and return success status.
+  bool Init(PP_Resource context_id, const PP_VideoConfigElement* dec_config);
+
   // Tell command buffer to process all commands it has received so far.
   void FlushCommandBuffer();
 
   // This is NULL before initialization, and if this PPB_VideoDecoder_Impl is
   // swapped with another.
   scoped_refptr<PluginDelegate::PlatformVideoDecoder> platform_video_decoder_;
 
   // Factory to produce our callbacks.
   base::ScopedCallbackFactory<PPB_VideoDecoder_Impl> callback_factory_;
 
   // The resource ID of the underlying Context3d object being used.  Used only
   // for reference counting to keep it alive for the lifetime of |*this|.
   PP_Resource context3d_id_;
 
-  PP_CompletionCallback initialization_callback_;
   PP_CompletionCallback flush_callback_;
   PP_CompletionCallback reset_callback_;
   CallbackById bitstream_buffer_callbacks_;
 
   // Reference to the plugin requesting this interface.
   const PPP_VideoDecoder_Dev* ppp_videodecoder_;
 
   // Reference to the GLES2Implementation owned by PPB_Context3D_Impl.
   // PPB_Context3D_Impl is guaranteed to be alive for the lifetime of this
   // class.
   // In the out-of-process case, Context3D's gles2_impl() exists in the plugin
   // process only, so gles2_impl_ is NULL in that case.
   gpu::gles2::GLES2Implementation* gles2_impl_;
 
   DISALLOW_COPY_AND_ASSIGN(PPB_VideoDecoder_Impl);
 };
 
 }  // namespace ppapi
 }  // namespace webkit
 
 #endif  // WEBKIT_PLUGINS_PPAPI_PPB_VIDEO_DECODER_IMPL_H_