diff options
author | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-30 00:48:33 +0000 |
---|---|---|
committer | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-30 00:48:33 +0000 |
commit | 1b2ec22ed8df1fb018e6ac402fc3b4f52e80a948 (patch) | |
tree | fbb93817da9d7315b45cf1288685cc860eef77e3 /webkit/plugins/ppapi/ppb_video_decoder_impl.h | |
parent | 2854079e500f26d2b4c9b9b41ce1792e4a28091c (diff) | |
download | chromium_src-1b2ec22ed8df1fb018e6ac402fc3b4f52e80a948.zip chromium_src-1b2ec22ed8df1fb018e6ac402fc3b4f52e80a948.tar.gz chromium_src-1b2ec22ed8df1fb018e6ac402fc3b4f52e80a948.tar.bz2 |
Allow both Context3D and Graphics3D with the video decoder
BUG=none
TEST=Pepper Flash
Review URL: http://codereview.chromium.org/7765011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98742 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/plugins/ppapi/ppb_video_decoder_impl.h')
-rw-r--r-- | webkit/plugins/ppapi/ppb_video_decoder_impl.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/webkit/plugins/ppapi/ppb_video_decoder_impl.h b/webkit/plugins/ppapi/ppb_video_decoder_impl.h index c7593ce..a76d0ec 100644 --- a/webkit/plugins/ppapi/ppb_video_decoder_impl.h +++ b/webkit/plugins/ppapi/ppb_video_decoder_impl.h @@ -48,7 +48,7 @@ class PPB_VideoDecoder_Impl : public ::ppapi::Resource, // See PPB_VideoDecoder_Dev::Create. Returns 0 on failure to create & // initialize. static PP_Resource Create(PP_Instance instance, - PP_Resource context3d_id, + PP_Resource graphics_context, const PP_VideoConfigElement* config); // Resource overrides. @@ -77,14 +77,12 @@ class PPB_VideoDecoder_Impl : public ::ppapi::Resource, virtual void NotifyEndOfBitstreamBuffer(int32 buffer_id) OVERRIDE; virtual void NotifyResetDone() OVERRIDE; - protected: - // VideoDecoderImpl implementation. - virtual bool Init(PP_Resource context3d_id, - ::ppapi::thunk::PPB_Context3D_API* context, - const PP_VideoConfigElement* dec_config) OVERRIDE; - private: explicit PPB_VideoDecoder_Impl(PP_Instance instance); + bool Init(PP_Resource graphics_context, + PluginDelegate::PlatformContext3D* context, + gpu::gles2::GLES2Implementation* gles2_impl, + const PP_VideoConfigElement* config); // This is NULL before initialization, and if this PPB_VideoDecoder_Impl is // swapped with another. |