Revert 86681 - Updated OMX decoder for recent PPAPI changes, and added to the build.

webkit/plugins/ppapi/ppb_video_decoder_impl.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/plugins/ppapi/ppb_video_decoder_impl.h"
 
 #include <string>
 
 #include "base/logging.h"
 #include "media/video/picture.h"
@@ skipping 380 matching lines @@
   std::swap(callback, flush_callback_);
   PP_RunCompletionCallback(&callback, PP_OK);
 }
 
 }  // namespace ppapi
 }  // namespace webkit
 
 // 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 {
-BaseBuffer::BaseBuffer(const PP_BufferInfo_Dev& info)
+BufferInfo::BufferInfo(const PP_BufferInfo_Dev& info)
     : id_(info.id),
       size_(info.size.width, info.size.height) {
 }
 
 // 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)
-    : BaseBuffer(buffer.info),
-      texture_id_(buffer.texture_id),
-      context_id_(buffer.context) {
+    : texture_id_(buffer.texture_id),
+      context_id_(buffer.context),
+      info_(buffer.info) {
 }
 
 SysmemBuffer::SysmemBuffer(const PP_SysmemBuffer_Dev& buffer)
-    : BaseBuffer(buffer.info) {
+    : info_(buffer.info) {
   scoped_refptr<webkit::ppapi::PPB_Buffer_Impl> pepper_buffer =
       webkit::ppapi::Resource::GetAs<webkit::ppapi::PPB_Buffer_Impl>(
           buffer.data);
   assert(pepper_buffer->is_mapped());
   data_ = pepper_buffer->mapped_buffer();
 }
 
 Picture::Picture(const PP_Picture_Dev& picture)
     : picture_buffer_id_(picture.picture_buffer_id),
       bitstream_buffer_id_(picture.bitstream_buffer_id),
       visible_size_(picture.visible_size.width, picture.visible_size.height),
       decoded_size_(picture.decoded_size.width, picture.decoded_size.height) {
 }
 
 }  // namespace media