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..c7ba059e93ba12dd3af94f80eda20804c8a65484 100644
--- a/content/common/gpu/media/rendering_helper.h
+++ b/content/common/gpu/media/rendering_helper.h
@@ -63,6 +63,8 @@ struct RenderingHelperParams {
   // The members below are only used for the thumbnail mode where all frames
   // are rendered in sequence onto one FBO for comparison/verification purposes.
 
+  // Whether any rendering will actually happen.
+  bool suppress_rendering;

[Owen Lin, 2014/11/03 06:59:06]

Remove this ? Rebase conflict ?

[llandwerlin-old, 2014/11/03 09:30:10]

As you suggested in a different comment, I will use the frame_duration_ instead
of this flag.

   // Whether the frames are rendered as scaled thumbnails within a
   // larger FBO that is in turn rendered to the window.
   bool render_as_thumbnails;
@@ -115,8 +117,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 +175,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_;