diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-17 19:15:35 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-17 19:15:35 +0000 |
| commit | 6f516083864319feeb02ae4dc32609216455366b (patch) | |
| tree | 285a57fee02c581e22d272951633d4a56a7846e6 /content/content_renderer.gypi | |
| parent | 6421fe84fee932545c65ab77b7dcdc60be28accc (diff) | |
| download | chromium_src-6f516083864319feeb02ae4dc32609216455366b.zip chromium_src-6f516083864319feeb02ae4dc32609216455366b.tar.gz chromium_src-6f516083864319feeb02ae4dc32609216455366b.tar.bz2 | |
Move a bunch of gpu/worker/plugin renderer code to content. I temporarily disabled the sad plugin code while I add a renderer chrome interface in a follow up.
TBR=avi
Review URL: http://codereview.chromium.org/6713005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78579 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/content_renderer.gypi')
| -rw-r--r-- | content/content_renderer.gypi | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi index ee7bbf1..239c922 100644 --- a/content/content_renderer.gypi +++ b/content/content_renderer.gypi @@ -13,6 +13,7 @@ '../skia/skia.gyp:skia', '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', '../third_party/libjingle/libjingle.gyp:libjingle', + '../third_party/npapi/npapi.gyp:npapi', ], 'include_dirs': [ '..', @@ -32,6 +33,12 @@ 'renderer/geolocation_dispatcher.h', 'renderer/ggl.cc', 'renderer/ggl.h', + 'renderer/gpu_channel_host.cc', + 'renderer/gpu_channel_host.h', + 'renderer/gpu_video_decoder_host.cc', + 'renderer/gpu_video_decoder_host.h', + 'renderer/gpu_video_service_host.cc', + 'renderer/gpu_video_service_host.h', 'renderer/indexed_db_dispatcher.cc', 'renderer/indexed_db_dispatcher.h', 'renderer/media/audio_renderer_impl.cc', @@ -50,8 +57,38 @@ 'renderer/p2p/socket_client.h', 'renderer/p2p/socket_dispatcher.cc', 'renderer/p2p/socket_dispatcher.h', + 'renderer/plugin_channel_host.cc', + 'renderer/plugin_channel_host.h', 'renderer/speech_input_dispatcher.cc', 'renderer/speech_input_dispatcher.h', + 'renderer/webgraphicscontext3d_command_buffer_impl.cc', + 'renderer/webgraphicscontext3d_command_buffer_impl.h', + 'renderer/webplugin_delegate_proxy.cc', + 'renderer/webplugin_delegate_proxy.h', + 'renderer/websharedworker_proxy.cc', + 'renderer/websharedworker_proxy.h', + 'renderer/websharedworkerrepository_impl.cc', + 'renderer/websharedworkerrepository_impl.h', + 'renderer/webworker_base.cc', + 'renderer/webworker_base.h', + 'renderer/webworker_proxy.cc', + 'renderer/webworker_proxy.h', + ], + 'conditions': [ + ['enable_gpu==1', { + 'dependencies': [ + '../gpu/gpu.gyp:gles2_c_lib', + ], + 'sources': [ + 'renderer/command_buffer_proxy.cc', + 'renderer/command_buffer_proxy.h', + ], + }], + ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { + 'dependencies': [ + '../build/linux/system.gyp:gtk', + ], + }], ], }, ], |