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

Unified Diff: webkit/plugins/ppapi/ppb_video_decoder_impl.h

Issue 7765011: Allow both Context3D and Graphics3D with the video decoder (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: context3d_id -> graphics_context Created 9 years, 4 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
« no previous file with comments | « webkit/plugins/ppapi/ppb_graphics_3d_impl.h ('k') | webkit/plugins/ppapi/ppb_video_decoder_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/plugins/ppapi/ppb_video_decoder_impl.h
diff --git a/webkit/plugins/ppapi/ppb_video_decoder_impl.h b/webkit/plugins/ppapi/ppb_video_decoder_impl.h
index c7593ced762d528ab6cc71f4efbf78d99830d3e2..a76d0ec27ce7f158e38d9fe801a5a23ab4dc3064 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.
« no previous file with comments | « webkit/plugins/ppapi/ppb_graphics_3d_impl.h ('k') | webkit/plugins/ppapi/ppb_video_decoder_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698