Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(353)

Unified Diff: content/content_common.gypi

Issue 8622004: Reland 110355 - Use shared D3D9 texture to transport the compositor's backing buffer to the brows... (Closed) Base URL: svn://chrome-svn/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 111043)
+++ content/content_common.gypi (working copy)
@@ -143,6 +143,10 @@
'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',
@@ -272,10 +276,6 @@
'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',
@@ -298,11 +298,7 @@
'common/gpu/x_util.h',
],
}],
- ['ui_compositor_image_transport==1', {
- 'sources': [
- 'common/gpu/image_transport_surface.cc',
- 'common/gpu/image_transport_surface_linux.cc',
- ],
+ ['OS=="linux"', {
'include_dirs': [
'<(DEPTH)/third_party/angle/include',
],

Powered by Google App Engine
This is Rietveld 408576698