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

media/video/picture.cc

Index: media/video/picture.cc
diff --git a/media/video/picture.cc b/media/video/picture.cc
index dd57e4af4d3f3ce89d9fd6d85104fd9c48e73df7..c8c02aca6159db38b25068005cee53ac88a75736 100644
--- a/media/video/picture.cc
+++ b/media/video/picture.cc
@@ -9,12 +9,10 @@ namespace media {
 // PictureBuffer implementation.
 PictureBuffer::PictureBuffer(int32 id,
                              gfx::Size pixel_size,
-                             std::vector<uint32> color_format,
                              MemoryType memory_type,
                              std::vector<DataPlaneHandle> data_plane_handles)
     : id_(id),
       pixel_size_(pixel_size),
-      color_format_(color_format),
       memory_type_(memory_type),
       data_plane_handles_(data_plane_handles) {
 }
@@ -29,10 +27,6 @@ gfx::Size PictureBuffer::GetSize() {
   return pixel_size_;
 }
 
-const std::vector<uint32>& PictureBuffer::GetColorFormat() {
-  return color_format_;
-}
-
 PictureBuffer::MemoryType PictureBuffer::GetMemoryType() {
   return memory_type_;
 }
@@ -42,9 +36,9 @@ std::vector<PictureBuffer::DataPlaneHandle>& PictureBuffer::GetPlaneHandles() {
 }
 
 // Picture implementation.
-Picture::Picture(PictureBuffer* picture_buffer, gfx::Size decoded_pixel_size,
+Picture::Picture(int32  picture_buffer_id, gfx::Size decoded_pixel_size,
                  gfx::Size visible_pixel_size, void* user_handle)
-    : picture_buffer_(picture_buffer),
+    : picture_buffer_id_(picture_buffer_id),
       decoded_pixel_size_(decoded_pixel_size),
       visible_pixel_size_(visible_pixel_size),
       user_handle_(user_handle) {
@@ -52,8 +46,8 @@ Picture::Picture(PictureBuffer* picture_buffer, gfx::Size decoded_pixel_size,
 
 Picture::~Picture() {}
 
-PictureBuffer* Picture::picture_buffer() {
-  return picture_buffer_;
+int32 Picture::GetId() {
+  return picture_buffer_id_;
 }
 
 gfx::Size Picture::GetDecodedSize() const {
@@ -69,4 +63,3 @@ void* Picture::GetUserHandle() {
 }
 
 }  // namespace media
-