Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(188)

Unified Diff: media/video/picture.cc

Issue 7057027: Updated OMX decoder for recent PPAPI changes, and added to the build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased to ToT r86339 Created 9 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: media/video/picture.cc
diff --git a/media/video/picture.cc b/media/video/picture.cc
index 581e3c97ae45952249c28fbf20d559e9980d23cf..f2d6632058719be44006f5c759c50790c9e6f44b 100644
--- a/media/video/picture.cc
+++ b/media/video/picture.cc
@@ -6,25 +6,22 @@
namespace media {
+BaseBuffer::~BaseBuffer() {}
+
// 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),
- size_(size) {
+BaseBuffer::BaseBuffer(int32 id, gfx::Size size) : id_(id), size_(size) {
}
GLESBuffer::GLESBuffer(
int32 id, gfx::Size size, uint32 texture_id, uint32 context_id)
- : texture_id_(texture_id),
- context_id_(context_id),
- info_(id, size) {
+ : BaseBuffer(id, size), texture_id_(texture_id), context_id_(context_id) {
}
SysmemBuffer::SysmemBuffer(int32 id, gfx::Size size, void* data)
- : data_(data),
- info_(id, size) {
+ : BaseBuffer(id, size), data_(data) {
}
Picture::Picture(int32 picture_buffer_id, int32 bitstream_buffer_id,

Powered by Google App Engine
This is Rietveld 408576698