Index: webkit/plugins/ppapi/ppb_video_decoder_impl.h |
=================================================================== |
--- webkit/plugins/ppapi/ppb_video_decoder_impl.h (revision 113419) |
+++ webkit/plugins/ppapi/ppb_video_decoder_impl.h (working copy) |
@@ -13,8 +13,8 @@ |
#include "base/memory/scoped_ptr.h" |
#include "ppapi/c/dev/pp_video_dev.h" |
#include "ppapi/c/pp_var.h" |
+#include "ppapi/shared_impl/ppb_video_decoder_shared.h" |
#include "ppapi/shared_impl/resource.h" |
-#include "ppapi/shared_impl/video_decoder_impl.h" |
#include "ppapi/thunk/ppb_video_decoder_api.h" |
#include "webkit/plugins/ppapi/plugin_delegate.h" |
@@ -33,7 +33,7 @@ |
namespace ppapi { |
class PPB_VideoDecoder_Impl : public ::ppapi::Resource, |
- public ::ppapi::VideoDecoderImpl, |
+ public ::ppapi::PPB_VideoDecoder_Shared, |
public media::VideoDecodeAccelerator::Client { |
public: |
virtual ~PPB_VideoDecoder_Impl(); |
Property changes on: webkit/plugins/ppapi/ppb_video_decoder_impl.h |
___________________________________________________________________ |
Deleted: svn:mergeinfo |
Reverse-merged /branches/chrome_webkit_merge_branch/src/webkit/plugins/ppapi/ppb_video_decoder_impl.h:r3734-4217,4606-5108,5177-5263 |