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..a312eea2ad3aa2720a90f47bf83c86c2479f528f 100644
--- a/media/video/picture.cc
+++ b/media/video/picture.cc
@@ -6,67 +6,25 @@
 
 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)
+// Implementations for the other constructors are found in
+// webkit/plugins/ppapi/ppb_video_decoder_impl.cc.
+// They are not included in this file because it would require
+// media/ to depend on files in ppapi/.
+BufferInfo::BufferInfo(int32 id, gfx::Size size)
     : id_(id),
-      pixel_size_(pixel_size),
-      color_format_(color_format),
-      memory_type_(memory_type),
-      data_plane_handles_(data_plane_handles) {
+      size_(size) {
 }
 
-PictureBuffer::~PictureBuffer() {}
-
-int32 PictureBuffer::GetId() {
-  return id_;
-}
-
-gfx::Size PictureBuffer::GetSize() {
-  return pixel_size_;
-}
-
-const std::vector<uint32>& PictureBuffer::GetColorFormat() {
-  return color_format_;
+GLESBuffer::GLESBuffer(
+    int32 id, gfx::Size size, uint32 texture_id, uint32 context_id)
+    : texture_id_(texture_id),
+      context_id_(context_id),
+      info_(id, size) {
 }
 
-PictureBuffer::MemoryType PictureBuffer::GetMemoryType() {
-  return memory_type_;
-}
-
-std::vector<PictureBuffer::DataPlaneHandle>& PictureBuffer::GetPlaneHandles() {
-  return data_plane_handles_;
-}
-
-// Picture implementation.
-Picture::Picture(PictureBuffer* picture_buffer, gfx::Size decoded_pixel_size,
-                 gfx::Size visible_pixel_size, void* user_handle)
-    : picture_buffer_(picture_buffer),
-      decoded_pixel_size_(decoded_pixel_size),
-      visible_pixel_size_(visible_pixel_size),
-      user_handle_(user_handle) {
-}
-
-Picture::~Picture() {}
-
-PictureBuffer* Picture::picture_buffer() {
-  return picture_buffer_;
-}
-
-gfx::Size Picture::GetDecodedSize() const {
-  return decoded_pixel_size_;
-}
-
-gfx::Size Picture::GetVisibleSize() const {
-  return visible_pixel_size_;
-}
-
-void* Picture::GetUserHandle() {
-  return user_handle_;
+SysmemBuffer::SysmemBuffer(int32 id, gfx::Size size, void* data)
+    : data_(data),
+      info_(id, size) {
 }
 
 }  // namespace media
-