Index: content/common/gpu/media/rendering_helper.h |
diff --git a/content/common/gpu/media/rendering_helper.h b/content/common/gpu/media/rendering_helper.h |
index b080f6816ce180d517b655e212ea5150fadb77df..88d769f35bf4bc64ac9064430543bcf07f30e39f 100644 |
--- a/content/common/gpu/media/rendering_helper.h |
+++ b/content/common/gpu/media/rendering_helper.h |
@@ -115,8 +115,11 @@ class RenderingHelper { |
// Get the platform specific handle to the OpenGL display. |
void* GetGLDisplay(); |
+ // Get the GL context. |
+ scoped_refptr<gfx::GLContext> GetGLContext(); |
+ |
// Get the platform specific handle to the OpenGL context. |
- void* GetGLContext(); |
+ void* GetGLContextHandle(); |
// Get rendered thumbnails as RGB. |
// Sets alpha_solid to true if the alpha channel is entirely 0xff. |
@@ -170,6 +173,11 @@ class RenderingHelper { |
scoped_refptr<gfx::GLContext> gl_context_; |
scoped_refptr<gfx::GLSurface> gl_surface_; |
+#if defined(USE_OZONE) |
+ class StubOzoneDelegate; |
+ scoped_ptr<StubOzoneDelegate> platform_window_delegate_; |
+#endif |
+ |
gfx::AcceleratedWidget window_; |
gfx::Size screen_size_; |