content/content_common.gypi - Issue 8558008: Revert 110626 - Reland 110355 - Use shared D3D9 texture to transport the compositor's backing buf...

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/content_common.gypi

Issue 8558008: Revert 110626 - Reland 110355 - Use shared D3D9 texture to transport the compositor's backing buf... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 9 years, 1 month 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: content/content_common.gypi

===================================================================

--- content/content_common.gypi (revision 110637)

+++ content/content_common.gypi (working copy)

@@ -141,10 +141,6 @@

'common/gpu/gpu_process_launch_causes.h',

'common/gpu/gpu_watchdog.h',

'common/gpu/image_transport_surface.h',

- 'common/gpu/image_transport_surface.cc',

- 'common/gpu/image_transport_surface_linux.cc',

- 'common/gpu/image_transport_surface_mac.cc',

- 'common/gpu/image_transport_surface_win.cc',

'common/gpu/media/gpu_video_decode_accelerator.cc',

'common/gpu/media/gpu_video_decode_accelerator.h',

'common/gpu/transport_texture.cc',

@@ -274,6 +270,10 @@

'sources!': [

'common/process_watcher_posix.cc',

+ 'sources': [

+ 'common/gpu/image_transport_surface.cc',

+ 'common/gpu/image_transport_surface_mac.cc',

+ ],

'link_settings': {

'mac_bundle_resources': [

'common/common.sb',

@@ -296,7 +296,11 @@

'common/gpu/x_util.h',

}],

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

+ ['ui_compositor_image_transport==1', {

+ 'sources': [

+ 'common/gpu/image_transport_surface.cc',

+ 'common/gpu/image_transport_surface_linux.cc',

+ ],

'include_dirs': [

'<(DEPTH)/third_party/angle/include',

« no previous file with comments | « content/content_browser.gypi ('k') | ui/gfx/surface/surface.gyp » ('j') | no next file with comments »