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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: remoting/remoting.gyp

Issue 11470028: Move screen capturers to remoting/capturer. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years 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
« remoting/capturer/video_frame_capturer_win.cc ('K') | « remoting/host/video_scheduler_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/remoting.gyp
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp
index 216a85533080c37498002d3e08373175fe70c14c..29f168290b855819199408b2dad9cb3ad6887c61 100644
--- a/remoting/remoting.gyp
+++ b/remoting/remoting.gyp
@@ -246,21 +246,56 @@
['enable_remoting_host==1', {
'targets': [
{
- 'target_name': 'differ_block',
+ 'target_name': 'remoting_screen_capturer',
'type': 'static_library',
'variables': { 'enable_wexit_time_destructors': 1, },
+ 'dependencies': [
+ '../skia/skia.gyp:skia',
+ ],
+ 'sources': [
+ 'capturer/capture_data.cc',
+ 'capturer/capture_data.h',
+ 'capturer/shared_buffer.cc',
+ 'capturer/shared_buffer.h',
+ 'capturer/shared_buffer_factory.h',
+ 'capturer/differ.cc',
+ 'capturer/differ.h',
+ 'capturer/differ_block.cc',
+ 'capturer/differ_block.h',
+ 'capturer/linux/x_server_pixel_buffer.cc',
+ 'capturer/linux/x_server_pixel_buffer.h',
+ 'capturer/mouse_cursor_shape.cc',
+ 'capturer/mouse_cursor_shape.h',
+ 'capturer/video_frame.cc',
+ 'capturer/video_frame.h',
+ 'capturer/video_frame_capturer.h',
+ 'capturer/video_frame_capturer_fake.cc',
+ 'capturer/video_frame_capturer_fake.h',
+ 'capturer/video_frame_capturer_helper.cc',
+ 'capturer/video_frame_capturer_helper.h',
+ 'capturer/video_frame_capturer_linux.cc',
+ 'capturer/video_frame_capturer_mac.mm',
+ 'capturer/video_frame_capturer_win.cc',
+ 'capturer/video_frame_queue.cc',
+ 'capturer/video_frame_queue.h',
+ ],
'conditions': [
[ 'target_arch == "ia32" or target_arch == "x64"', {
'dependencies': [
'differ_block_sse2',
],
}],
+ ['toolkit_uses_gtk==1', {
+ 'dependencies': [
+ '../build/linux/system.gyp:gtk',
+ ],
+ }, { # else toolkit_uses_gtk!=1
+ 'sources!': [
+ '*_gtk.cc',
+ ],
+ }],
],
- 'sources': [
- 'host/differ_block.cc',
- 'host/differ_block.h',
- ],
- }, # end of target differ_block
+ }, # end of target remoting_screen_capturer
{
'target_name': 'remoting_host',
@@ -270,7 +305,7 @@
'remoting_base',
'remoting_jingle_glue',
'remoting_protocol',
- 'differ_block',
+ 'remoting_screen_capturer',
'../crypto/crypto.gyp:crypto',
'../google_apis/google_apis.gyp:google_apis',
'../ipc/ipc.gyp:ipc',
@@ -319,8 +354,6 @@
'host/desktop_session_connector.h',
'host/desktop_session_proxy.cc',
'host/desktop_session_proxy.h',
- 'host/differ.cc',
- 'host/differ.h',
'host/disconnect_window.h',
'host/disconnect_window_gtk.cc',
'host/disconnect_window_mac.h',
@@ -372,8 +405,6 @@
'host/linux/x11_util.h',
'host/linux/x_server_clipboard.cc',
'host/linux/x_server_clipboard.h',
- 'host/linux/x_server_pixel_buffer.cc',
- 'host/linux/x_server_pixel_buffer.h',
'host/local_input_monitor.h',
'host/local_input_monitor_linux.cc',
'host/local_input_monitor_mac.mm',
@@ -420,18 +451,6 @@
'host/usage_stats_consent.h',
'host/usage_stats_consent_mac.cc',
'host/usage_stats_consent_win.cc',
- 'host/video_frame.cc',
- 'host/video_frame.h',
- 'host/video_frame_capturer.h',
- 'host/video_frame_capturer_fake.cc',
- 'host/video_frame_capturer_fake.h',
- 'host/video_frame_capturer_helper.cc',
- 'host/video_frame_capturer_helper.h',
- 'host/video_frame_capturer_linux.cc',
- 'host/video_frame_capturer_mac.mm',
- 'host/video_frame_capturer_win.cc',
- 'host/video_frame_queue.cc',
- 'host/video_frame_queue.h',
'host/video_scheduler.cc',
'host/video_scheduler.h',
'host/vlog_net_log.cc',
@@ -1866,8 +1885,6 @@
'base/auto_thread_task_runner.h',
'base/auth_token_util.cc',
'base/auth_token_util.h',
- 'base/capture_data.cc',
- 'base/capture_data.h',
'base/compound_buffer.cc',
'base/compound_buffer.h',
'base/constants.cc',
@@ -1880,9 +1897,6 @@
'base/resources.h',
'base/running_average.cc',
'base/running_average.h',
- 'base/shared_buffer.cc',
- 'base/shared_buffer.h',
- 'base/shared_buffer_factory.h',
'base/socket_reader.cc',
'base/socket_reader.h',
'base/stoppable.cc',
@@ -2118,7 +2132,8 @@
}],
],
'sources': [
- 'host/differ_block_sse2.cc',
+ 'capturer/differ_block_sse2.cc',
+ 'capturer/differ_block_sse2.h',
],
}, # end of target differ_block_sse2
@@ -2155,13 +2170,20 @@
'sources': [
'../chrome/test/base/run_all_remoting_unittests.cc',
'base/auth_token_util_unittest.cc',
- 'base/auto_thread_unittest.cc',
'base/auto_thread_task_runner_unittest.cc',
+ 'base/auto_thread_unittest.cc',
'base/breakpad_win_unittest.cc',
'base/compound_buffer_unittest.cc',
'base/resources_unittest.cc',
- 'base/shared_buffer_unittest.cc',
'base/util_unittest.cc',
+ 'capturer/capturer_mock_objects.cc',
+ 'capturer/capturer_mock_objects.h',
+ 'capturer/differ_block_unittest.cc',
+ 'capturer/differ_unittest.cc',
+ 'capturer/shared_buffer_unittest.cc',
+ 'capturer/video_frame_capturer_helper_unittest.cc',
+ 'capturer/video_frame_capturer_mac_unittest.cc',
+ 'capturer/video_frame_capturer_unittest.cc',
'client/audio_player_unittest.cc',
'client/key_event_mapper_unittest.cc',
'client/plugin/mac_key_event_processor_unittest.cc',
@@ -2191,8 +2213,6 @@
'host/desktop_session_agent.h',
'host/desktop_session_agent_posix.cc',
'host/desktop_session_agent_win.cc',
- 'host/differ_block_unittest.cc',
- 'host/differ_unittest.cc',
'host/heartbeat_sender_unittest.cc',
'host/host_key_pair_unittest.cc',
'host/host_mock_objects.cc',
@@ -2214,9 +2234,6 @@
'host/setup/oauth_helper_unittest.cc',
'host/setup/pin_validator_unittest.cc',
'host/test_key_pair.h',
- 'host/video_frame_capturer_helper_unittest.cc',
- 'host/video_frame_capturer_mac_unittest.cc',
- 'host/video_frame_capturer_unittest.cc',
'host/video_scheduler_unittest.cc',
'host/websocket_connection_unittest.cc',
'host/win/launch_process_with_token.cc',
@@ -2252,9 +2269,9 @@
'protocol/message_reader_unittest.cc',
'protocol/mouse_input_filter_unittest.cc',
'protocol/negotiating_authenticator_unittest.cc',
+ 'protocol/ppapi_module_stub.cc',
'protocol/protocol_mock_objects.cc',
'protocol/protocol_mock_objects.h',
- 'protocol/ppapi_module_stub.cc',
'protocol/ssl_hmac_channel_authenticator_unittest.cc',
'protocol/v2_authenticator_unittest.cc',
],
« remoting/capturer/video_frame_capturer_win.cc ('K') | « remoting/host/video_scheduler_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698