VaapiVideoAccelerator: make Vaapi accelerator work with ozone

content/common/gpu/media/rendering_helper.h

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 1ebc91bf1b65cc472a98320894666101eab3189b..9a298552b9d5f518f6d41d7a00b1f59b56d0261b 100644
--- a/content/common/gpu/media/rendering_helper.h
+++ b/content/common/gpu/media/rendering_helper.h
@@ -110,8 +110,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.
@@ -120,6 +123,8 @@ class RenderingHelper {
                           base::WaitableEvent* done);
 
  private:
+  class StubOzoneDelegate;

[Pawel Osciak, 2014/09/24 11:27:10]

#if defined(USE_OZONE) ? Or even move it down to where platform_window_delegate_
is defined?

+
   struct RenderedVideo {
     // The rect on the screen where the video will be rendered.
     gfx::Rect render_area;
@@ -158,6 +163,10 @@ class RenderingHelper {
   scoped_refptr<gfx::GLContext> gl_context_;
   scoped_refptr<gfx::GLSurface> gl_surface_;
 
+#if defined(USE_OZONE)
+  scoped_ptr<StubOzoneDelegate> platform_window_delegate_;
+#endif
+
   gfx::AcceleratedWidget window_;
 
   gfx::Size screen_size_;