Update VideoDecode PPAPI structs to be consistent with media structures, part 1

media/video/picture.h

Index: media/video/picture.h
diff --git a/media/video/picture.h b/media/video/picture.h
index ec84453fa1f55992d9c665e8832b3be27628f3da..3000f8561a47bac2aa34dcf30340e93a231251d4 100644
--- a/media/video/picture.h
+++ b/media/video/picture.h
@@ -16,22 +16,19 @@ namespace media {
 //            classes and refactor as needed with the rest of media stack.
 class PictureBuffer : public VideoDecodeAccelerator::PictureBuffer {
  public:
-  PictureBuffer(int32 id, gfx::Size pixel_size,
-                std::vector<uint32> color_format, MemoryType memory_type,
+  PictureBuffer(int32 id, gfx::Size pixel_size, MemoryType memory_type,
                 std::vector<DataPlaneHandle> data_plane_handles);
   virtual ~PictureBuffer();
 
   // VideoDecodeAccelerator::PictureBuffer implementation.
   virtual int32 GetId() OVERRIDE;
   virtual gfx::Size GetSize() OVERRIDE;
-  virtual const std::vector<uint32>& GetColorFormat() OVERRIDE;
   virtual MemoryType GetMemoryType() OVERRIDE;
   virtual std::vector<DataPlaneHandle>& GetPlaneHandles() OVERRIDE;
 
  private:
   int32 id_;
   gfx::Size pixel_size_;
-  std::vector<uint32> color_format_;
   MemoryType memory_type_;
   std::vector<DataPlaneHandle>& data_plane_handles_;
 
@@ -40,19 +37,19 @@ class PictureBuffer : public VideoDecodeAccelerator::PictureBuffer {
 
 class Picture : public VideoDecodeAccelerator::Picture {
  public:
-  Picture(PictureBuffer* picture_buffer, gfx::Size decoded_pixel_size,
+  Picture(int32 picture_buffer_id, gfx::Size decoded_pixel_size,
           gfx::Size visible_pixel_size, void* user_handle);
   virtual ~Picture();
 
   // VideoDecodeAccelerator::Picture implementation.
-  virtual PictureBuffer* picture_buffer() OVERRIDE;
+  virtual int32 GetId() OVERRIDE;
   virtual gfx::Size GetDecodedSize() const OVERRIDE;
   virtual gfx::Size GetVisibleSize() const OVERRIDE;
   virtual void* GetUserHandle() OVERRIDE;
 
  private:
-  // Pointer to the picture buffer which contains this picture.
-  PictureBuffer* picture_buffer_;
+  // ID of the picture buffer which contains this picture.
+  int32 picture_buffer_id_;
   gfx::Size decoded_pixel_size_;
   gfx::Size visible_pixel_size_;
   void* user_handle_;