| Index: webkit/plugins/ppapi/ppb_video_decoder_impl.cc
|
| diff --git a/webkit/plugins/ppapi/ppb_video_decoder_impl.cc b/webkit/plugins/ppapi/ppb_video_decoder_impl.cc
|
| index 76edf084db209379bf17774c1c78363fe2f3ac12..f6674c24e0e440a79be41c6090c3ca5708e9c0cb 100644
|
| --- a/webkit/plugins/ppapi/ppb_video_decoder_impl.cc
|
| +++ b/webkit/plugins/ppapi/ppb_video_decoder_impl.cc
|
| @@ -398,7 +398,7 @@ void PPB_VideoDecoder_Impl::NotifyFlushDone() {
|
| // These functions are declared in picture.h but are defined here because of
|
| // dependencies (we can't depend on ppapi types from media).
|
| namespace media {
|
| -BufferInfo::BufferInfo(const PP_BufferInfo_Dev& info)
|
| +BaseBuffer::BaseBuffer(const PP_BufferInfo_Dev& info)
|
| : id_(info.id),
|
| size_(info.size.width, info.size.height) {
|
| }
|
| @@ -406,13 +406,13 @@ BufferInfo::BufferInfo(const PP_BufferInfo_Dev& info)
|
| // TODO(vrk): This assigns the PP_Resource context to be
|
| // the context_id. Not sure what it's actually supposed to be.
|
| GLESBuffer::GLESBuffer(const PP_GLESBuffer_Dev& buffer)
|
| - : texture_id_(buffer.texture_id),
|
| - context_id_(buffer.context),
|
| - info_(buffer.info) {
|
| + : BaseBuffer(buffer.info),
|
| + texture_id_(buffer.texture_id),
|
| + context_id_(buffer.context) {
|
| }
|
|
|
| SysmemBuffer::SysmemBuffer(const PP_SysmemBuffer_Dev& buffer)
|
| - : info_(buffer.info) {
|
| + : BaseBuffer(buffer.info) {
|
| scoped_refptr<webkit::ppapi::PPB_Buffer_Impl> pepper_buffer =
|
| webkit::ppapi::Resource::GetAs<webkit::ppapi::PPB_Buffer_Impl>(
|
| buffer.data);
|
|
|