VaapiVideoAccelerator: make Vaapi accelerator work with ozone

content/common/gpu/media/rendering_helper.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_COMMON_GPU_MEDIA_RENDERING_HELPER_H_
 #define CONTENT_COMMON_GPU_MEDIA_RENDERING_HELPER_H_
 
 #include <map>
 #include <queue>
 #include <vector>
@@ skipping 92 matching lines @@
   // Flushes the pending frames. Notify the rendering_helper there won't be
   // more video frames.
   void Flush(size_t window_id);
 
   // Delete |texture_id|.
   void DeleteTexture(uint32 texture_id);
 
   // 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.
   void GetThumbnailsAsRGB(std::vector<unsigned char>* rgb,
                           bool* alpha_solid,
                           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;
 
     // True if the last (and the only one) frame in pending_frames has
     // been rendered. We keep the last remaining frame in pending_frames even
     // after it has been rendered, so that we have something to display if the
     // client is falling behind on providing us with new frames during
     // timer-driven playback.
     bool last_frame_rendered;
@@ skipping 18 matching lines @@
   // |texture_target|.
   void RenderTexture(uint32 texture_target, uint32 texture_id);
 
   // Timer to trigger the RenderContent() repeatly.
   scoped_ptr<base::RepeatingTimer<RenderingHelper> > render_timer_;
   base::MessageLoop* message_loop_;
 
   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_;
 
   std::vector<RenderedVideo> videos_;
 
   bool render_as_thumbnails_;
   int frame_count_;
   GLuint thumbnails_fbo_id_;
   GLuint thumbnails_texture_id_;
   gfx::Size thumbnails_fbo_size_;
   gfx::Size thumbnail_size_;
   GLuint program_;
   base::TimeDelta frame_duration_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderingHelper);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_GPU_MEDIA_RENDERING_HELPER_H_