ui/gl/gl.gyp - Issue 1258713002: ozone: unify GpuMemoryBufferFactoryOzoneNativePixmap in content/

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: ui/gl/gl.gyp

Issue 1258713002: ozone: unify GpuMemoryBufferFactoryOzoneNativePixmap in content/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: resolve nits Created 5 years, 5 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

Index: ui/gl/gl.gyp

diff --git a/ui/gl/gl.gyp b/ui/gl/gl.gyp

index ae4dfa9014c57333dd6c9cca381e5300a63ef624..7221f28bf6bf573d08ddd4bc66dce919baa48ac8 100644

--- a/ui/gl/gl.gyp

+++ b/ui/gl/gl.gyp

@@ -150,12 +150,6 @@

'gl_implementation_osmesa.h',

}],

- ['OS=="linux"', {

- 'sources': [

- 'gl_image_linux_dma_buffer.cc',

- 'gl_image_linux_dma_buffer.h',

- ],

- }],

['use_x11 == 1', {

'sources': [

'gl_bindings_autogen_glx.cc',

@@ -264,6 +258,10 @@

'sources/': [ ['exclude', '^android/'] ],

}],

['use_ozone==1', {

+ 'sources': [

+ 'gl_image_ozone_native_pixmap.cc',

+ 'gl_image_ozone_native_pixmap.h',

+ ],

'dependencies': [

'../ozone/ozone.gyp:ozone',

'../ozone/ozone.gyp:ozone_base',

« content/common/gpu/gpu_memory_buffer_factory_ozone_native_pixmap.cc ('K') | « ui/gl/BUILD.gn ('k') | ui/gl/gl_image_linux_dma_buffer.h » ('j') | no next file with comments »