summaryrefslogtreecommitdiff
path: root/chromium/content/content_renderer.gypi
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/content/content_renderer.gypi')
-rw-r--r--chromium/content/content_renderer.gypi201
1 files changed, 96 insertions, 105 deletions
diff --git a/chromium/content/content_renderer.gypi b/chromium/content/content_renderer.gypi
index 144f8de37ef..52ce045a761 100644
--- a/chromium/content/content_renderer.gypi
+++ b/chromium/content/content_renderer.gypi
@@ -4,21 +4,21 @@
{
'dependencies': [
- 'content_common_mojo_bindings',
'../base/base.gyp:base',
'../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
'../cc/cc.gyp:cc',
'../cc/blink/cc_blink.gyp:cc_blink',
+ '../components/scheduler/scheduler.gyp:scheduler',
'../device/battery/battery.gyp:device_battery',
'../device/battery/battery.gyp:device_battery_mojo_bindings',
+ '../device/vibration/vibration.gyp:device_vibration',
+ '../device/vibration/vibration.gyp:device_vibration_mojo_bindings',
'../gin/gin.gyp:gin',
'../gpu/gpu.gyp:gpu',
'../jingle/jingle.gyp:jingle_glue',
'../media/blink/media_blink.gyp:media_blink',
'../media/media.gyp:media',
- '../mojo/edk/mojo_edk.gyp:mojo_js_lib',
'../mojo/mojo_base.gyp:mojo_environment_chromium',
- '../mojo/public/mojo_public.gyp:mojo_application_bindings',
'../net/net.gyp:net',
'../skia/skia.gyp:skia',
'../storage/storage_common.gyp:storage_common',
@@ -26,16 +26,17 @@
'../third_party/icu/icu.gyp:icui18n',
'../third_party/icu/icu.gyp:icuuc',
'../third_party/libjingle/libjingle.gyp:libjingle',
+ '../third_party/mojo/mojo_edk.gyp:mojo_js_lib',
'../third_party/npapi/npapi.gyp:npapi',
'../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h',
'../ui/accessibility/accessibility.gyp:accessibility',
- '../ui/events/events.gyp:dom4_keycode_converter',
+ '../ui/events/events.gyp:dom_keycode_converter',
'../ui/gfx/gfx.gyp:gfx',
'../ui/gfx/gfx.gyp:gfx_geometry',
'../ui/native_theme/native_theme.gyp:native_theme',
'../ui/surface/surface.gyp:surface',
'../v8/tools/gyp/v8.gyp:v8',
- '../webkit/common/gpu/webkit_gpu.gyp:webkit_gpu',
+ 'content_common_mojo_bindings.gyp:content_common_mojo_bindings',
],
'include_dirs': [
'..',
@@ -45,6 +46,7 @@
'public_renderer_sources': [
'public/renderer/android_content_detection_prefixes.cc',
'public/renderer/android_content_detection_prefixes.h',
+ 'public/renderer/browser_plugin_delegate.cc',
'public/renderer/browser_plugin_delegate.h',
'public/renderer/content_renderer_client.cc',
'public/renderer/content_renderer_client.h',
@@ -55,12 +57,11 @@
'public/renderer/navigation_state.h',
'public/renderer/pepper_plugin_instance.h',
'public/renderer/platform_event_observer.h',
- 'public/renderer/renderer_ppapi_host.h',
+ 'public/renderer/render_font_warmup_win.h',
'public/renderer/render_frame.h',
'public/renderer/render_frame_observer.cc',
'public/renderer/render_frame_observer.h',
'public/renderer/render_frame_observer_tracker.h',
- 'public/renderer/render_font_warmup_win.h',
'public/renderer/render_process_observer.cc',
'public/renderer/render_process_observer.h',
'public/renderer/render_thread.cc',
@@ -70,11 +71,14 @@
'public/renderer/render_view_observer.h',
'public/renderer/render_view_observer_tracker.h',
'public/renderer/render_view_visitor.h',
+ 'public/renderer/renderer_ppapi_host.h',
'public/renderer/resource_fetcher.h',
- 'public/renderer/v8_value_converter.h',
'public/renderer/video_encode_accelerator.cc',
'public/renderer/video_encode_accelerator.h',
],
+ 'public_renderer_plugin_sources': [
+ 'public/renderer/plugin_instance_throttler.h',
+ ],
'private_renderer_sources': [
'renderer/accessibility/blink_ax_enum_conversion.cc',
'renderer/accessibility/blink_ax_enum_conversion.h',
@@ -82,8 +86,6 @@
'renderer/accessibility/blink_ax_tree_source.h',
'renderer/accessibility/renderer_accessibility.cc',
'renderer/accessibility/renderer_accessibility.h',
- 'renderer/active_notification_tracker.cc',
- 'renderer/active_notification_tracker.h',
'renderer/android/address_detector.cc',
'renderer/android/address_detector.h',
'renderer/android/content_detector.cc',
@@ -102,12 +104,18 @@
'renderer/browser_plugin/browser_plugin.h',
'renderer/browser_plugin/browser_plugin_manager.cc',
'renderer/browser_plugin/browser_plugin_manager.h',
- 'renderer/clipboard_utils.cc',
- 'renderer/clipboard_utils.h',
+ 'renderer/cache_storage/cache_storage_dispatcher.cc',
+ 'renderer/cache_storage/cache_storage_dispatcher.h',
+ 'renderer/cache_storage/cache_storage_message_filter.cc',
+ 'renderer/cache_storage/cache_storage_message_filter.h',
+ 'renderer/cache_storage/webserviceworkercachestorage_impl.cc',
+ 'renderer/cache_storage/webserviceworkercachestorage_impl.h',
'renderer/child_frame_compositing_helper.cc',
'renderer/child_frame_compositing_helper.h',
'renderer/chrome_object_extensions_utils.cc',
'renderer/chrome_object_extensions_utils.h',
+ 'renderer/clipboard_utils.cc',
+ 'renderer/clipboard_utils.h',
'renderer/context_menu_params_builder.cc',
'renderer/context_menu_params_builder.h',
'renderer/cursor_utils.cc',
@@ -127,6 +135,9 @@
'renderer/devtools/devtools_agent_filter.h',
'renderer/devtools/devtools_client.cc',
'renderer/devtools/devtools_client.h',
+ 'renderer/devtools/lock_free_circular_queue.h',
+ 'renderer/devtools/v8_sampling_profiler.cc',
+ 'renderer/devtools/v8_sampling_profiler.h',
'renderer/disambiguation_popup_helper.cc',
'renderer/disambiguation_popup_helper.h',
'renderer/dom_automation_controller.cc',
@@ -144,8 +155,6 @@
'renderer/dom_utils.h',
'renderer/drop_data_builder.cc',
'renderer/drop_data_builder.h',
- 'renderer/fetchers/image_resource_fetcher.cc',
- 'renderer/fetchers/image_resource_fetcher.h',
'renderer/fetchers/manifest_fetcher.cc',
'renderer/fetchers/manifest_fetcher.h',
'renderer/fetchers/multi_resolution_image_resource_fetcher.cc',
@@ -158,10 +167,13 @@
'renderer/gamepad_shared_memory_reader.h',
'renderer/geolocation_dispatcher.cc',
'renderer/geolocation_dispatcher.h',
+ 'renderer/gpu/compositor_dependencies.h',
+ 'renderer/gpu/compositor_external_begin_frame_source.cc',
+ 'renderer/gpu/compositor_external_begin_frame_source.h',
+ 'renderer/gpu/compositor_forwarding_message_filter.cc',
+ 'renderer/gpu/compositor_forwarding_message_filter.h',
'renderer/gpu/compositor_output_surface.cc',
'renderer/gpu/compositor_output_surface.h',
- 'renderer/gpu/compositor_software_output_device.cc',
- 'renderer/gpu/compositor_software_output_device.h',
'renderer/gpu/delegated_compositor_output_surface.cc',
'renderer/gpu/delegated_compositor_output_surface.h',
'renderer/gpu/frame_swap_message_queue.cc',
@@ -201,6 +213,8 @@
'renderer/input/input_handler_wrapper.h',
'renderer/input/input_scroll_elasticity_controller.cc',
'renderer/input/input_scroll_elasticity_controller.h',
+ 'renderer/input/main_thread_input_event_filter.cc',
+ 'renderer/input/main_thread_input_event_filter.h',
'renderer/internal_document_state_data.cc',
'renderer/internal_document_state_data.h',
'renderer/java/gin_java_bridge_dispatcher.cc',
@@ -209,6 +223,8 @@
'renderer/java/gin_java_bridge_object.h',
'renderer/java/gin_java_bridge_value_converter.cc',
'renderer/java/gin_java_bridge_value_converter.h',
+ 'renderer/java/gin_java_function_invocation_helper.cc',
+ 'renderer/java/gin_java_function_invocation_helper.h',
'renderer/manifest/manifest_manager.cc',
'renderer/manifest/manifest_manager.h',
'renderer/manifest/manifest_parser.cc',
@@ -244,23 +260,17 @@
'renderer/media/audio_message_filter.h',
'renderer/media/audio_renderer_mixer_manager.cc',
'renderer/media/audio_renderer_mixer_manager.h',
- 'renderer/media/cdm_session_adapter.cc',
- 'renderer/media/cdm_session_adapter.h',
- 'renderer/media/crypto/encrypted_media_player_support_impl.cc',
- 'renderer/media/crypto/encrypted_media_player_support_impl.h',
- 'renderer/media/crypto/key_systems.cc',
- 'renderer/media/crypto/key_systems.h',
- 'renderer/media/crypto/key_systems_support_uma.cc',
- 'renderer/media/crypto/key_systems_support_uma.h',
+ 'renderer/media/crypto/cdm_initialized_promise.cc',
+ 'renderer/media/crypto/cdm_initialized_promise.h',
'renderer/media/crypto/pepper_cdm_wrapper.h',
'renderer/media/crypto/pepper_cdm_wrapper_impl.cc',
'renderer/media/crypto/pepper_cdm_wrapper_impl.h',
'renderer/media/crypto/ppapi_decryptor.cc',
'renderer/media/crypto/ppapi_decryptor.h',
- 'renderer/media/crypto/proxy_decryptor.cc',
- 'renderer/media/crypto/proxy_decryptor.h',
'renderer/media/crypto/render_cdm_factory.cc',
'renderer/media/crypto/render_cdm_factory.h',
+ 'renderer/media/media_permission_dispatcher.cc',
+ 'renderer/media/media_permission_dispatcher.h',
'renderer/media/media_stream_audio_level_calculator.cc',
'renderer/media/media_stream_audio_level_calculator.h',
'renderer/media/media_stream_audio_renderer.cc',
@@ -276,6 +286,8 @@
'renderer/media/midi_dispatcher.h',
'renderer/media/midi_message_filter.cc',
'renderer/media/midi_message_filter.h',
+ 'renderer/media/render_media_client.cc',
+ 'renderer/media/render_media_client.h',
'renderer/media/render_media_log.cc',
'renderer/media/render_media_log.h',
'renderer/media/renderer_gpu_video_accelerator_factories.cc',
@@ -292,10 +304,6 @@
'renderer/media/video_capture_message_filter.h',
'renderer/media/video_frame_provider.cc',
'renderer/media/video_frame_provider.h',
- 'renderer/media/webcontentdecryptionmodule_impl.cc',
- 'renderer/media/webcontentdecryptionmodule_impl.h',
- 'renderer/media/webcontentdecryptionmodulesession_impl.cc',
- 'renderer/media/webcontentdecryptionmodulesession_impl.h',
'renderer/media/webmediaplayer_ms.cc',
'renderer/media/webmediaplayer_ms.h',
'renderer/memory_benchmarking_extension.cc',
@@ -308,18 +316,18 @@
'renderer/mojo/service_registry_js_wrapper.h',
'renderer/mouse_lock_dispatcher.cc',
'renderer/mouse_lock_dispatcher.h',
+ 'renderer/navigation_state_impl.cc',
+ 'renderer/navigation_state_impl.h',
'renderer/net_info_helper.cc',
'renderer/net_info_helper.h',
- 'renderer/notification_icon_loader.cc',
- 'renderer/notification_icon_loader.h',
'renderer/notification_permission_dispatcher.cc',
'renderer/notification_permission_dispatcher.h',
- 'renderer/notification_provider.cc',
- 'renderer/notification_provider.h',
- 'renderer/push_messaging_dispatcher.cc',
- 'renderer/push_messaging_dispatcher.h',
- 'renderer/push_permission_dispatcher.cc',
- 'renderer/push_permission_dispatcher.h',
+ 'renderer/presentation/presentation_dispatcher.cc',
+ 'renderer/presentation/presentation_dispatcher.h',
+ 'renderer/presentation/presentation_session_client.cc',
+ 'renderer/presentation/presentation_session_client.h',
+ 'renderer/push_messaging/push_messaging_dispatcher.cc',
+ 'renderer/push_messaging/push_messaging_dispatcher.h',
'renderer/render_font_warmup_win.cc',
'renderer/render_frame_impl.cc',
'renderer/render_frame_impl.h',
@@ -333,21 +341,18 @@
'renderer/render_view_impl.cc',
'renderer/render_view_impl.h',
'renderer/render_view_impl_android.cc',
- 'renderer/render_view_impl_params.cc',
- 'renderer/render_view_impl_params.h',
'renderer/render_view_linux.cc',
'renderer/render_view_mouse_lock_dispatcher.cc',
'renderer/render_view_mouse_lock_dispatcher.h',
+ 'renderer/render_view_win.cc',
'renderer/render_widget.cc',
'renderer/render_widget.h',
'renderer/render_widget_fullscreen.cc',
'renderer/render_widget_fullscreen.h',
'renderer/renderer_blink_platform_impl.cc',
'renderer/renderer_blink_platform_impl.h',
- 'renderer/renderer_clipboard_client.cc',
- 'renderer/renderer_clipboard_client.h',
- 'renderer/renderer_font_platform_win.cc',
- 'renderer/renderer_font_platform_win.h',
+ 'renderer/renderer_clipboard_delegate.cc',
+ 'renderer/renderer_clipboard_delegate.h',
'renderer/renderer_main.cc',
'renderer/renderer_main_platform_delegate.h',
'renderer/renderer_main_platform_delegate_android.cc',
@@ -366,27 +371,12 @@
'renderer/sad_plugin.h',
'renderer/savable_resources.cc',
'renderer/savable_resources.h',
- 'renderer/scheduler/null_renderer_scheduler.cc',
- 'renderer/scheduler/null_renderer_scheduler.h',
- 'renderer/scheduler/renderer_scheduler.cc',
- 'renderer/scheduler/renderer_scheduler.h',
- 'renderer/scheduler/renderer_scheduler_impl.cc',
- 'renderer/scheduler/renderer_scheduler_impl.h',
- 'renderer/scheduler/renderer_task_queue_selector.cc',
- 'renderer/scheduler/renderer_task_queue_selector.h',
- 'renderer/scheduler/single_thread_idle_task_runner.cc',
- 'renderer/scheduler/single_thread_idle_task_runner.h',
- 'renderer/scheduler/task_queue_manager.cc',
- 'renderer/scheduler/task_queue_manager.h',
- 'renderer/scheduler/task_queue_selector.h',
- 'renderer/scheduler/web_scheduler_impl.cc',
- 'renderer/scheduler/web_scheduler_impl.h',
+ 'renderer/scheduler/resource_dispatch_throttler.cc',
+ 'renderer/scheduler/resource_dispatch_throttler.h',
'renderer/screen_orientation/screen_orientation_dispatcher.cc',
'renderer/screen_orientation/screen_orientation_dispatcher.h',
'renderer/screen_orientation/screen_orientation_observer.cc',
'renderer/screen_orientation/screen_orientation_observer.h',
- 'renderer/scoped_clipboard_writer_glue.cc',
- 'renderer/scoped_clipboard_writer_glue.h',
'renderer/service_worker/embedded_worker_context_client.cc',
'renderer/service_worker/embedded_worker_context_client.h',
'renderer/service_worker/embedded_worker_context_message_filter.cc',
@@ -395,18 +385,18 @@
'renderer/service_worker/embedded_worker_devtools_agent.h',
'renderer/service_worker/embedded_worker_dispatcher.cc',
'renderer/service_worker/embedded_worker_dispatcher.h',
- 'renderer/service_worker/service_worker_cache_storage_dispatcher.cc',
- 'renderer/service_worker/service_worker_cache_storage_dispatcher.h',
'renderer/service_worker/service_worker_script_context.cc',
'renderer/service_worker/service_worker_script_context.h',
+ 'renderer/service_worker/service_worker_type_util.cc',
+ 'renderer/service_worker/service_worker_type_util.h',
'renderer/shared_memory_seqlock_reader.cc',
'renderer/shared_memory_seqlock_reader.h',
- 'renderer/shared_worker_repository.cc',
- 'renderer/shared_worker_repository.h',
- 'renderer/shared_worker/embedded_shared_worker_permission_client_proxy.cc',
- 'renderer/shared_worker/embedded_shared_worker_permission_client_proxy.h',
+ 'renderer/shared_worker/embedded_shared_worker_content_settings_client_proxy.cc',
+ 'renderer/shared_worker/embedded_shared_worker_content_settings_client_proxy.h',
'renderer/shared_worker/embedded_shared_worker_stub.cc',
'renderer/shared_worker/embedded_shared_worker_stub.h',
+ 'renderer/shared_worker_repository.cc',
+ 'renderer/shared_worker_repository.h',
'renderer/skia_benchmarking_extension.cc',
'renderer/skia_benchmarking_extension.h',
'renderer/speech_recognition_dispatcher.cc',
@@ -417,8 +407,6 @@
'renderer/stats_collection_observer.h',
'renderer/text_input_client_observer.cc',
'renderer/text_input_client_observer.h',
- 'renderer/v8_value_converter_impl.cc',
- 'renderer/v8_value_converter_impl.h',
'renderer/web_ui_extension.cc',
'renderer/web_ui_extension.h',
'renderer/web_ui_extension_data.cc',
@@ -437,8 +425,8 @@
'renderer/webpublicsuffixlist_impl.h',
'renderer/webscrollbarbehavior_impl_gtkoraura.cc',
'renderer/webscrollbarbehavior_impl_gtkoraura.h',
- 'renderer/webscrollbarbehavior_impl_mac.mm',
'renderer/webscrollbarbehavior_impl_mac.h',
+ 'renderer/webscrollbarbehavior_impl_mac.mm',
'renderer/websharedworker_proxy.cc',
'renderer/websharedworker_proxy.h',
],
@@ -478,6 +466,8 @@
'renderer/pepper/pepper_broker.h',
'renderer/pepper/pepper_browser_connection.cc',
'renderer/pepper/pepper_browser_connection.h',
+ 'renderer/pepper/pepper_camera_device_host.cc',
+ 'renderer/pepper/pepper_camera_device_host.h',
'renderer/pepper/pepper_compositor_host.cc',
'renderer/pepper/pepper_compositor_host.h',
'renderer/pepper/pepper_device_enumeration_host_helper.cc',
@@ -502,12 +492,14 @@
'renderer/pepper/pepper_platform_audio_input.h',
'renderer/pepper/pepper_platform_audio_output.cc',
'renderer/pepper/pepper_platform_audio_output.h',
+ 'renderer/pepper/pepper_platform_camera_device.cc',
+ 'renderer/pepper/pepper_platform_camera_device.h',
'renderer/pepper/pepper_platform_video_capture.cc',
'renderer/pepper/pepper_platform_video_capture.h',
'renderer/pepper/pepper_plugin_instance_impl.cc',
'renderer/pepper/pepper_plugin_instance_impl.h',
- 'renderer/pepper/pepper_plugin_instance_throttler.cc',
- 'renderer/pepper/pepper_plugin_instance_throttler.h',
+ 'renderer/pepper/pepper_plugin_instance_metrics.cc',
+ 'renderer/pepper/pepper_plugin_instance_metrics.h',
'renderer/pepper/pepper_plugin_registry.cc',
'renderer/pepper/pepper_plugin_registry.h',
'renderer/pepper/pepper_proxy_channel_delegate_impl.cc',
@@ -520,10 +512,14 @@
'renderer/pepper/pepper_video_capture_host.h',
'renderer/pepper/pepper_video_decoder_host.cc',
'renderer/pepper/pepper_video_decoder_host.h',
+ 'renderer/pepper/pepper_video_encoder_host.cc',
+ 'renderer/pepper/pepper_video_encoder_host.h',
'renderer/pepper/pepper_webplugin_impl.cc',
'renderer/pepper/pepper_webplugin_impl.h',
'renderer/pepper/pepper_websocket_host.cc',
'renderer/pepper/pepper_websocket_host.h',
+ 'renderer/pepper/plugin_instance_throttler_impl.cc',
+ 'renderer/pepper/plugin_instance_throttler_impl.h',
'renderer/pepper/plugin_module.cc',
'renderer/pepper/plugin_module.h',
'renderer/pepper/plugin_object.cc',
@@ -565,23 +561,22 @@
'renderer/pepper/url_request_info_util.h',
'renderer/pepper/url_response_info_util.cc',
'renderer/pepper/url_response_info_util.h',
- 'renderer/pepper/usb_key_code_conversion.cc',
- 'renderer/pepper/usb_key_code_conversion.h',
- 'renderer/pepper/usb_key_code_conversion_linux.cc',
- 'renderer/pepper/usb_key_code_conversion_mac.cc',
- 'renderer/pepper/usb_key_code_conversion_win.cc',
- 'renderer/pepper/v8object_var.cc',
- 'renderer/pepper/v8object_var.h',
'renderer/pepper/v8_var_converter.cc',
'renderer/pepper/v8_var_converter.h',
+ 'renderer/pepper/v8object_var.cc',
+ 'renderer/pepper/v8object_var.h',
'renderer/pepper/video_decoder_shim.cc',
'renderer/pepper/video_decoder_shim.h',
+ 'renderer/pepper/video_encoder_shim.cc',
+ 'renderer/pepper/video_encoder_shim.h',
'renderer/render_widget_fullscreen_pepper.cc',
'renderer/render_widget_fullscreen_pepper.h',
],
'public_renderer_webrtc_sources': [
- 'public/renderer/media_stream_audio_sink.h',
+ 'public/renderer/media_stream_api.cc',
+ 'public/renderer/media_stream_api.h',
'public/renderer/media_stream_audio_sink.cc',
+ 'public/renderer/media_stream_audio_sink.h',
'public/renderer/media_stream_sink.h',
'public/renderer/media_stream_video_sink.cc',
'public/renderer/media_stream_video_sink.h',
@@ -590,20 +585,20 @@
# WebRTC-specific sources. Put WebRTC plugin-related stuff in the
# Plugin+WebRTC section below.
'private_renderer_webrtc_sources': [
- 'renderer/media/media_stream.h',
'renderer/media/media_stream.cc',
+ 'renderer/media/media_stream.h',
'renderer/media/media_stream_audio_processor.cc',
'renderer/media/media_stream_audio_processor.h',
'renderer/media/media_stream_audio_processor_options.cc',
'renderer/media/media_stream_audio_processor_options.h',
'renderer/media/media_stream_audio_sink_owner.cc',
'renderer/media/media_stream_audio_sink_owner.h',
+ 'renderer/media/media_stream_audio_source.cc',
+ 'renderer/media/media_stream_audio_source.h',
'renderer/media/media_stream_audio_track_sink.h',
'renderer/media/media_stream_center.cc',
'renderer/media/media_stream_dispatcher.cc',
'renderer/media/media_stream_registry_interface.h',
- 'renderer/media/media_stream_audio_source.cc',
- 'renderer/media/media_stream_audio_source.h',
'renderer/media/media_stream_renderer_factory.cc',
'renderer/media/media_stream_renderer_factory.h',
'renderer/media/media_stream_source.cc',
@@ -614,10 +609,6 @@
'renderer/media/media_stream_video_source.h',
'renderer/media/media_stream_video_track.cc',
'renderer/media/media_stream_video_track.h',
- 'renderer/media/native_handle_impl.cc',
- 'renderer/media/native_handle_impl.h',
- 'renderer/media/peer_connection_audio_sink_owner.cc',
- 'renderer/media/peer_connection_audio_sink_owner.h',
'renderer/media/peer_connection_identity_service.cc',
'renderer/media/peer_connection_identity_service.h',
'renderer/media/peer_connection_tracker.cc',
@@ -651,14 +642,14 @@
'renderer/media/video_track_adapter.h',
'renderer/media/webaudio_capturer_source.cc',
'renderer/media/webaudio_capturer_source.h',
- 'renderer/media/webrtc/webrtc_video_track_adapter.cc',
- 'renderer/media/webrtc/webrtc_video_track_adapter.h',
'renderer/media/webrtc/media_stream_remote_video_source.cc',
'renderer/media/webrtc/media_stream_remote_video_source.h',
'renderer/media/webrtc/media_stream_track_metrics.cc',
'renderer/media/webrtc/media_stream_track_metrics.h',
'renderer/media/webrtc/peer_connection_dependency_factory.cc',
'renderer/media/webrtc/peer_connection_dependency_factory.h',
+ 'renderer/media/webrtc/track_observer.cc',
+ 'renderer/media/webrtc/track_observer.h',
'renderer/media/webrtc/video_destination_handler.cc',
'renderer/media/webrtc/video_destination_handler.h',
'renderer/media/webrtc/webrtc_audio_sink_adapter.cc',
@@ -669,6 +660,8 @@
'renderer/media/webrtc/webrtc_media_stream_adapter.h',
'renderer/media/webrtc/webrtc_video_capturer_adapter.cc',
'renderer/media/webrtc/webrtc_video_capturer_adapter.h',
+ 'renderer/media/webrtc/webrtc_video_track_adapter.cc',
+ 'renderer/media/webrtc/webrtc_video_track_adapter.h',
'renderer/media/webrtc_audio_capturer.cc',
'renderer/media/webrtc_audio_capturer.h',
'renderer/media/webrtc_audio_device_impl.cc',
@@ -722,12 +715,6 @@
'<@(private_renderer_sources)',
],
'conditions': [
- ['notifications==0', {
- 'sources!': [
- 'renderer/notification_provider.cc',
- 'renderer/active_notification_tracker.cc',
- ],
- }],
['OS=="mac"', {
'sources!': [
'common/process_watcher_posix.cc',
@@ -740,8 +727,8 @@
],
}, {
'sources!': [
- 'renderer/webscrollbarbehavior_impl_mac.mm',
'renderer/webscrollbarbehavior_impl_mac.h',
+ 'renderer/webscrollbarbehavior_impl_mac.mm',
],
}],
['OS=="win" and win_use_allocator_shim==1', {
@@ -752,18 +739,15 @@
['OS=="android"', {
'sources!': [
'renderer/media/audio_decoder.cc',
- 'renderer/media/crypto/encrypted_media_player_support_impl.cc',
],
'sources': [
'renderer/external_popup_menu.cc',
'renderer/external_popup_menu.h',
],
'dependencies': [
+ '../build/android/ndk.gyp:cpu_features',
'../third_party/libphonenumber/libphonenumber.gyp:libphonenumber',
],
- 'includes': [
- '../build/android/cpufeatures.gypi',
- ],
}, {
'sources!': [
'renderer/java/gin_java_bridge_dispatcher.cc',
@@ -772,11 +756,12 @@
'renderer/java/gin_java_bridge_object.h',
'renderer/java/gin_java_bridge_value_converter.cc',
'renderer/java/gin_java_bridge_value_converter.h',
- 'renderer/java/java_bridge_channel.cc',
- 'renderer/java/java_bridge_channel.h',
- 'renderer/java/java_bridge_dispatcher.cc',
- 'renderer/java/java_bridge_dispatcher.h',
+ 'renderer/java/gin_java_function_invocation_helper.cc',
+ 'renderer/java/gin_java_function_invocation_helper.h',
],
+ 'dependencies': [
+ '../media/cast/cast.gyp:cast_sender',
+ ]
}],
# TODO(jrg): remove the OS=="android" section?
# http://crbug.com/113172
@@ -801,12 +786,13 @@
],
},{ # enable_webrtc==0
'sources': [
- 'renderer/media/webrtc_logging_noop.cc',
'renderer/media/webrtc_logging.h',
+ 'renderer/media/webrtc_logging_noop.cc',
],
}],
['enable_plugins==1', {
'sources': [
+ '<@(public_renderer_plugin_sources)',
'<@(private_renderer_plugin_sources)',
],
'conditions': [
@@ -815,6 +801,8 @@
# Android does not build FFmpeg, which these depend on.
'renderer/pepper/video_decoder_shim.cc',
'renderer/pepper/video_decoder_shim.h',
+ 'renderer/pepper/video_encoder_shim.cc',
+ 'renderer/pepper/video_encoder_shim.h',
],
}],
],
@@ -853,6 +841,9 @@
'renderer/media/crypto/renderer_cdm_manager.h',
],
}],
+ ['use_seccomp_bpf==1', {
+ 'defines': ['USE_SECCOMP_BPF'],
+ }],
],
'target_conditions': [
['OS=="android"', {
View Lorry Controller Status