PPB_VideoDecoder_Dev::Initialize is now synchronous!

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"
@@ skipping 35 matching lines @@
 
 PPB_VideoDecoder_Impl::~PPB_VideoDecoder_Impl() {
 }
 
 PPB_VideoDecoder_API* PPB_VideoDecoder_Impl::AsPPB_VideoDecoder_API() {
   return this;
 }
 
 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;
-
+    const PP_VideoConfigElement* decoder_config) {
   if (!instance())
     return PP_ERROR_FAILED;
 
   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());
 
   context3d_id_ = context_id;
@@ skipping 20 matching lines @@
   // VideoAttributeKey have identical enum values. There is no compiler
   // assert to guarantee this. We either need to add such asserts or
   // merge PP_VideoAttributeDictionary and VideoAttributeKey.
   for (const PP_VideoConfigElement* current = decoder_config;
        *current != PP_VIDEOATTR_DICTIONARY_TERMINATOR; ++current) {
     copied.push_back(static_cast<uint32>(*current));
   }
 
   FlushCommandBuffer();
   if (platform_video_decoder_->Initialize(copied)) {
-    initialization_callback_ = callback;
-    return PP_OK_COMPLETIONPENDING;
+    return PP_OK;
   } else {
     return PP_ERROR_FAILED;
   }
 }
 
 int32_t PPB_VideoDecoder_Impl::Decode(
     const PP_VideoBitstreamBuffer_Dev* bitstream_buffer,
     PP_CompletionCallback callback) {
   if (!platform_video_decoder_)
     return PP_ERROR_BADRESOURCE;
@@ skipping 156 matching lines @@
 
 void PPB_VideoDecoder_Impl::NotifyFlushDone() {
   if (flush_callback_.func == NULL)
     return;
 
   // Call the callback that was stored to be called when Flush is done.
   PP_RunAndClearCompletionCallback(&flush_callback_, PP_OK);
 }
 
 void PPB_VideoDecoder_Impl::NotifyInitializeDone() {
-  if (initialization_callback_.func == NULL)
-    return;
-
-  PP_RunAndClearCompletionCallback(&initialization_callback_, PP_OK);
+  NOTREACHED() << "PlatformVideoDecoder::Initialize() is synchronous!";
 }
 
 void PPB_VideoDecoder_Impl::FlushCommandBuffer() {
   // For the out-of-process case, |gles2_impl_| will be NULL in the renderer
   // process. The VideoDecoder_Proxy is charged with the responsibility of
   // doing this Flush() in the analogous places in the plugin process.
   if (gles2_impl_)
     gles2_impl_->Flush();
 }
 
 }  // namespace ppapi
 }  // namespace webkit