Fix PPB_VideoDecoder_Impl::NotifyEndOfBitstreamBuffer to use correct ID.

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 57 matching lines @@
   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 NotifyAbortDone() OVERRIDE;
 
  private:
+  typedef std::map<int32, PP_CompletionCallback> CallbackById;

[brettw, 2011/06/20 21:51:06]

Can you clarify what the "id" is that this is mapping from and what these
callbacks are for?

[Ami GONE FROM CHROMIUM, 2011/06/20 22:13:02]

Done.

+
   // This is NULL before initialization, and if this PPB_VideoDecoder_Impl is
   // swapped with another.
   scoped_ptr<PluginDelegate::PlatformVideoDecoder> platform_video_decoder_;
 
   // Factory to produce our callbacks.
   base::ScopedCallbackFactory<PPB_VideoDecoder_Impl> callback_factory_;
 
   PP_CompletionCallback initialization_callback_;
   PP_CompletionCallback abort_callback_;
   PP_CompletionCallback flush_callback_;
-  PP_CompletionCallback bitstream_buffer_callback_;
+  CallbackById bitstream_buffer_callbacks_;
 
   // Reference to the plugin requesting this interface.
   const PPP_VideoDecoder_Dev* ppp_videodecoder_;
 
   DISALLOW_COPY_AND_ASSIGN(PPB_VideoDecoder_Impl);
 };
 
 }  // namespace ppapi
 }  // namespace webkit
 
 #endif  // WEBKIT_PLUGINS_PPAPI_PPB_VIDEO_DECODER_IMPL_H_