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

Unified Diff: content/content_gpu.gypi

Issue 6793054: Moved code that runs in both the browser and GPU process from content/gpu to content/common/gpu. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 9 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
« no previous file with comments | « content/content_common.gypi ('k') | content/gpu/content_gpu_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/content_gpu.gypi
===================================================================
--- content/content_gpu.gypi (revision 80399)
+++ content/content_gpu.gypi (working copy)
@@ -14,17 +14,10 @@
'dependencies': [
'content_common',
'../base/base.gyp:base',
- '../media/media.gyp:media',
'../skia/skia.gyp:skia',
'../ui/gfx/gl/gl.gyp:gl',
],
'sources': [
- 'gpu/content_gpu_client.h',
- 'gpu/gpu_channel.cc',
- 'gpu/gpu_channel.h',
- 'gpu/gpu_command_buffer_stub.cc',
- 'gpu/gpu_command_buffer_stub.h',
- 'gpu/gpu_config.h',
'gpu/gpu_dx_diagnostics_win.cc',
'gpu/gpu_info_collector_linux.cc',
'gpu/gpu_info_collector_mac.mm',
@@ -36,19 +29,8 @@
'gpu/gpu_process.h',
'gpu/gpu_child_thread.cc',
'gpu/gpu_child_thread.h',
- 'gpu/gpu_render_thread.cc',
- 'gpu/gpu_render_thread.h',
- 'gpu/gpu_video_decoder.cc',
- 'gpu/gpu_video_decoder.h',
- 'gpu/gpu_video_service.cc',
- 'gpu/gpu_video_service.h',
'gpu/gpu_watchdog_thread.cc',
'gpu/gpu_watchdog_thread.h',
- 'gpu/media/gpu_video_device.h',
- 'gpu/media/fake_gl_video_decode_engine.cc',
- 'gpu/media/fake_gl_video_decode_engine.h',
- 'gpu/media/fake_gl_video_device.cc',
- 'gpu/media/fake_gl_video_device.h',
],
'include_dirs': [
'..',
@@ -109,22 +91,7 @@
],
},
],
- 'sources': [
- 'gpu/media/mft_angle_video_device.cc',
- 'gpu/media/mft_angle_video_device.h',
- ],
}],
- ['OS=="linux" and target_arch!="arm"', {
- 'sources': [
- 'gpu/x_util.cc',
- 'gpu/x_util.h',
- ],
- }],
- ['enable_gpu==1', {
- 'dependencies': [
- '../gpu/gpu.gyp:command_buffer_service',
- ],
- }],
],
},
],
« no previous file with comments | « content/content_common.gypi ('k') | content/gpu/content_gpu_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698