content/common/gpu/media/rendering_helper.h - Issue 490233002: VaapiVideoAccelerator: make Vaapi accelerator work with ozone

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/common/gpu/media/rendering_helper.h

Issue 490233002: VaapiVideoAccelerator: make Vaapi accelerator work with ozone (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Missing modifications in video accelerators Created 6 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« content/common/gpu/media/gpu_video_decode_accelerator.cc ('K') | « content/common/gpu/media/gpu_video_encode_accelerator.cc ('k') | content/common/gpu/media/rendering_helper.cc » ('j') | content/common/gpu/media/rendering_helper.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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..7afac54e6d5a751dedb46cde95156309028b15fd 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.

@@ -158,6 +161,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_;