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 b080f6816ce180d517b655e212ea5150fadb77df..d485e416595c051f3b250e0afbea8887eb59e8a0 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.
@@ -158,7 +161,7 @@ class RenderingHelper {
                              const base::TimeTicks timebase,
                              const base::TimeDelta interval);
 
-  void DropOneFrameForAllVideos();
+  uint32 DropOneFrameForAllVideos();
   void ScheduleNextRenderContent();
 
   // Render |texture_id| to the current view port of the screen using target
@@ -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_;