diff options
| author | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-08 01:48:48 +0000 |
|---|---|---|
| committer | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-08 01:48:48 +0000 |
| commit | f24a1e2b4c8e42794d1636e43bf033f8762410c0 (patch) | |
| tree | 4f5e50b905149674e93d063a8b31c53e0905bf70 /content/content_gpu.gypi | |
| parent | 31af5f2c16eb49136701e4a9d0b9625a12ba8b28 (diff) | |
| download | chromium_src-f24a1e2b4c8e42794d1636e43bf033f8762410c0.zip chromium_src-f24a1e2b4c8e42794d1636e43bf033f8762410c0.tar.gz chromium_src-f24a1e2b4c8e42794d1636e43bf033f8762410c0.tar.bz2 | |
Moved code that runs in both the browser and GPU process from content/gpu to content/common/gpu.
Also renamed GpuRenderThread to GpuChannelManager since that is what it really does.
The only remaining dependency from content/common/gpu to content/gpu is gpu_watchdog_thread.h. Once that dependency has been reversed it should be possible to move most or all of the code in content/gpu to chrome/gpu.
TEST=build, WebGL works, run by trybots.
BUG=none
Review URL: http://codereview.chromium.org/6793054
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80883 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/content_gpu.gypi')
| -rw-r--r-- | content/content_gpu.gypi | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/content/content_gpu.gypi b/content/content_gpu.gypi index cebb9ec..ffa7c4c 100644 --- a/content/content_gpu.gypi +++ b/content/content_gpu.gypi @@ -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', 'gpu/transport_texture.cc', 'gpu/transport_texture.h', ], @@ -111,21 +93,6 @@ ], }, ], - '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', - ], }], ], }, |