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 e66c8d5964ff5660264bd0849249645462b5ee0c..817ab1915a3496247c9bb9481942cc10ab8e12be 100644
--- a/content/common/gpu/media/rendering_helper.h
+++ b/content/common/gpu/media/rendering_helper.h
@@ -23,6 +23,10 @@ class MessageLoop;
 class WaitableEvent;
 }
 
+namespace ui {
+class DisplayConfigurator;
+}
+
 namespace content {
 
 class VideoFrameTexture : public base::RefCounted<VideoFrameTexture> {
@@ -114,8 +118,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.
@@ -169,6 +176,15 @@ 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_;
+
+#if defined(OS_CHROMEOS)
+  scoped_ptr<ui::DisplayConfigurator> display_configurator_;
+#endif
+#endif
+
   gfx::AcceleratedWidget window_;
 
   gfx::Size screen_size_;