diff options
author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-01-25 11:39:07 +0100 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-01-25 15:20:42 +0000 |
commit | 6c91641271e536ffaa88a1dff5127e42ee99a91e (patch) | |
tree | 703d9dd49602377ddc90cbf886aad37913f2496b /chromium/content/content_renderer.gypi | |
parent | b145b7fafd36f0c260d6a768c81fc14e32578099 (diff) | |
download | qtwebengine-chromium-6c91641271e536ffaa88a1dff5127e42ee99a91e.tar.gz |
BASELINE: Update Chromium to 49.0.2623.23
Also adds missing printing sources.
Change-Id: I3726b8f0c7d6751c9fc846096c571fadca7108cd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'chromium/content/content_renderer.gypi')
-rw-r--r-- | chromium/content/content_renderer.gypi | 131 |
1 files changed, 78 insertions, 53 deletions
diff --git a/chromium/content/content_renderer.gypi b/chromium/content/content_renderer.gypi index f9cbf85d2ec..c0f6449f5a5 100644 --- a/chromium/content/content_renderer.gypi +++ b/chromium/content/content_renderer.gypi @@ -7,11 +7,15 @@ '../base/base.gyp:base', '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', '../cc/cc.gyp:cc', + '../cc/cc.gyp:cc_proto', '../cc/blink/cc_blink.gyp:cc_blink', + '../components/components.gyp:startup_metric_utils_common', + '../components/components.gyp:webusb', '../components/scheduler/scheduler.gyp:scheduler', '../components/url_formatter/url_formatter.gyp:url_formatter', '../device/battery/battery.gyp:device_battery', '../device/battery/battery.gyp:device_battery_mojo_bindings', + '../device/devices_app/devices_app.gyp:device_usb_mojo_bindings_lib', '../device/vibration/vibration.gyp:device_vibration', '../device/vibration/vibration.gyp:device_vibration_mojo_bindings', '../gin/gin.gyp:gin', @@ -31,10 +35,12 @@ '../third_party/icu/icu.gyp:icui18n', '../third_party/icu/icu.gyp:icuuc', '../third_party/libjingle/libjingle.gyp:libjingle', + '../third_party/libyuv/libyuv.gyp:libyuv', '../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/blink/events_blink.gyp:events_blink', '../ui/events/events.gyp:dom_keycode_converter', '../ui/gfx/gfx.gyp:gfx', '../ui/gfx/gfx.gyp:gfx_geometry', @@ -53,6 +59,8 @@ 'public/renderer/android_content_detection_prefixes.h', 'public/renderer/browser_plugin_delegate.cc', 'public/renderer/browser_plugin_delegate.h', + 'public/renderer/chrome_object_extensions_utils.cc', + 'public/renderer/chrome_object_extensions_utils.h', 'public/renderer/content_renderer_client.cc', 'public/renderer/content_renderer_client.h', 'public/renderer/context_menu_client.h', @@ -102,8 +110,17 @@ 'renderer/android/phone_number_detector.h', 'renderer/android/renderer_date_time_picker.cc', 'renderer/android/renderer_date_time_picker.h', + 'renderer/android/synchronous_compositor_external_begin_frame_source.cc', + 'renderer/android/synchronous_compositor_external_begin_frame_source.h', 'renderer/android/synchronous_compositor_factory.cc', 'renderer/android/synchronous_compositor_factory.h', + 'renderer/android/synchronous_compositor_filter.cc', + 'renderer/android/synchronous_compositor_filter.h', + 'renderer/android/synchronous_compositor_output_surface.cc', + 'renderer/android/synchronous_compositor_output_surface.h', + 'renderer/android/synchronous_compositor_proxy.cc', + 'renderer/android/synchronous_compositor_proxy.h', + 'renderer/android/synchronous_compositor_registry.h', 'renderer/background_sync/background_sync_client_impl.cc', 'renderer/background_sync/background_sync_client_impl.h', 'renderer/battery_status/battery_status_dispatcher.cc', @@ -126,20 +143,18 @@ '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', 'renderer/cursor_utils.h', - 'renderer/date_time_suggestion_builder.cc', - 'renderer/date_time_suggestion_builder.h', 'renderer/device_sensors/device_light_event_pump.cc', 'renderer/device_sensors/device_light_event_pump.h', 'renderer/device_sensors/device_motion_event_pump.cc', 'renderer/device_sensors/device_motion_event_pump.h', + 'renderer/device_sensors/device_orientation_absolute_event_pump.cc', + 'renderer/device_sensors/device_orientation_absolute_event_pump.h', 'renderer/device_sensors/device_orientation_event_pump.cc', 'renderer/device_sensors/device_orientation_event_pump.h', 'renderer/device_sensors/device_sensor_event_pump.h', @@ -149,6 +164,8 @@ 'renderer/devtools/devtools_agent_filter.h', 'renderer/devtools/devtools_client.cc', 'renderer/devtools/devtools_client.h', + 'renderer/devtools/devtools_cpu_throttler.cc', + 'renderer/devtools/devtools_cpu_throttler.h', 'renderer/devtools/lock_free_circular_queue.h', 'renderer/devtools/v8_sampling_profiler.cc', 'renderer/devtools/v8_sampling_profiler.h', @@ -219,15 +236,13 @@ 'renderer/input/input_handler_manager.cc', 'renderer/input/input_handler_manager.h', 'renderer/input/input_handler_manager_client.h', - 'renderer/input/input_handler_proxy.cc', - 'renderer/input/input_handler_proxy.h', 'renderer/input/input_handler_wrapper.cc', '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/input/synchronous_input_handler_proxy.h', + 'renderer/input/render_widget_input_handler.cc', + 'renderer/input/render_widget_input_handler.h', + 'renderer/input/render_widget_input_handler_delegate.h', 'renderer/internal_document_state_data.cc', 'renderer/internal_document_state_data.h', 'renderer/java/gin_java_bridge_dispatcher.cc', @@ -246,8 +261,6 @@ 'renderer/manifest/manifest_uma_util.h', 'renderer/media/aec_dump_message_filter.cc', 'renderer/media/aec_dump_message_filter.h', - 'renderer/media/android/audio_decoder_android.cc', - 'renderer/media/android/audio_decoder_android.h', 'renderer/media/android/media_info_loader.cc', 'renderer/media/android/media_info_loader.h', 'renderer/media/android/media_source_delegate.cc', @@ -256,6 +269,8 @@ 'renderer/media/android/renderer_demuxer_android.h', 'renderer/media/android/renderer_media_player_manager.cc', 'renderer/media/android/renderer_media_player_manager.h', + 'renderer/media/android/renderer_media_session_manager.cc', + 'renderer/media/android/renderer_media_session_manager.h', 'renderer/media/android/stream_texture_factory.h', 'renderer/media/android/stream_texture_factory_impl.cc', 'renderer/media/android/stream_texture_factory_impl.h', @@ -263,6 +278,8 @@ 'renderer/media/android/stream_texture_factory_synchronous_impl.h', 'renderer/media/android/webmediaplayer_android.cc', 'renderer/media/android/webmediaplayer_android.h', + 'renderer/media/android/webmediasession_android.cc', + 'renderer/media/android/webmediasession_android.h', 'renderer/media/audio_decoder.cc', 'renderer/media/audio_decoder.h', 'renderer/media/audio_device_factory.cc', @@ -273,13 +290,13 @@ 'renderer/media/audio_message_filter.h', 'renderer/media/audio_renderer_mixer_manager.cc', 'renderer/media/audio_renderer_mixer_manager.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/render_cdm_factory.cc', - 'renderer/media/crypto/render_cdm_factory.h', + 'renderer/media/cdm/pepper_cdm_wrapper.h', + 'renderer/media/cdm/pepper_cdm_wrapper_impl.cc', + 'renderer/media/cdm/pepper_cdm_wrapper_impl.h', + 'renderer/media/cdm/ppapi_decryptor.cc', + 'renderer/media/cdm/ppapi_decryptor.h', + 'renderer/media/cdm/render_cdm_factory.cc', + 'renderer/media/cdm/render_cdm_factory.h', 'renderer/media/media_permission_dispatcher.cc', 'renderer/media/media_permission_dispatcher.h', 'renderer/media/media_permission_dispatcher_impl.cc', @@ -288,6 +305,8 @@ 'renderer/media/media_permission_dispatcher_proxy.h', 'renderer/media/media_stream_audio_level_calculator.cc', 'renderer/media/media_stream_audio_level_calculator.h', + 'renderer/media/media_stream_audio_track.cc', + 'renderer/media/media_stream_audio_track.h', 'renderer/media/media_stream_center.h', 'renderer/media/media_stream_constraints_util.cc', 'renderer/media/media_stream_constraints_util.h', @@ -307,6 +326,8 @@ 'renderer/media/renderer_gpu_video_accelerator_factories.h', 'renderer/media/renderer_webaudiodevice_impl.cc', 'renderer/media/renderer_webaudiodevice_impl.h', + 'renderer/media/renderer_webmediaplayer_delegate.cc', + 'renderer/media/renderer_webmediaplayer_delegate.h', 'renderer/media/renderer_webmidiaccessor_impl.cc', 'renderer/media/renderer_webmidiaccessor_impl.h', 'renderer/media/video_capture_impl.cc', @@ -317,14 +338,20 @@ 'renderer/media/video_capture_message_filter.h', 'renderer/media/webmediaplayer_ms.cc', 'renderer/media/webmediaplayer_ms.h', + 'renderer/media/webmediaplayer_ms_compositor.cc', + 'renderer/media/webmediaplayer_ms_compositor.h', 'renderer/memory_benchmarking_extension.cc', 'renderer/memory_benchmarking_extension.h', 'renderer/menu_item_builder.cc', 'renderer/menu_item_builder.h', - 'renderer/mhtml_generator.cc', - 'renderer/mhtml_generator.h', 'renderer/mojo/service_registry_js_wrapper.cc', 'renderer/mojo/service_registry_js_wrapper.h', + 'renderer/mojo_bindings_controller.cc', + 'renderer/mojo_bindings_controller.h', + 'renderer/mojo_context_state.cc', + 'renderer/mojo_context_state.h', + 'renderer/mojo_main_runner.cc', + 'renderer/mojo_main_runner.h', 'renderer/mouse_lock_dispatcher.cc', 'renderer/mouse_lock_dispatcher.h', 'renderer/navigation_state_impl.cc', @@ -419,24 +446,22 @@ 'renderer/stats_collection_observer.h', 'renderer/text_input_client_observer.cc', 'renderer/text_input_client_observer.h', - 'renderer/theme_helper_mac.mm', 'renderer/theme_helper_mac.h', + 'renderer/theme_helper_mac.mm', 'renderer/usb/type_converters.cc', 'renderer/usb/type_converters.h', 'renderer/usb/web_usb_client_impl.cc', 'renderer/usb/web_usb_client_impl.h', 'renderer/usb/web_usb_device_impl.cc', 'renderer/usb/web_usb_device_impl.h', + 'renderer/wake_lock/wake_lock_dispatcher.cc', + 'renderer/wake_lock/wake_lock_dispatcher.h', + 'renderer/web_frame_utils.cc', + 'renderer/web_frame_utils.h', 'renderer/web_ui_extension.cc', 'renderer/web_ui_extension.h', 'renderer/web_ui_extension_data.cc', 'renderer/web_ui_extension_data.h', - 'renderer/web_ui_mojo.cc', - 'renderer/web_ui_mojo.h', - 'renderer/web_ui_mojo_context_state.cc', - 'renderer/web_ui_mojo_context_state.h', - 'renderer/web_ui_runner.cc', - 'renderer/web_ui_runner.h', 'renderer/webclipboard_impl.cc', 'renderer/webclipboard_impl.h', 'renderer/webgraphicscontext3d_provider_impl.cc', @@ -480,6 +505,8 @@ 'renderer/pepper/host_var_tracker.h', 'renderer/pepper/message_channel.cc', 'renderer/pepper/message_channel.h', + 'renderer/pepper/pepper_audio_encoder_host.cc', + 'renderer/pepper/pepper_audio_encoder_host.h', 'renderer/pepper/pepper_audio_input_host.cc', 'renderer/pepper/pepper_audio_input_host.h', 'renderer/pepper/pepper_broker.cc', @@ -602,6 +629,14 @@ # WebRTC-specific sources. Put WebRTC plugin-related stuff in the # Plugin+WebRTC section below. 'private_renderer_webrtc_sources': [ + 'renderer/media/audio_repetition_detector.cc', + 'renderer/media/audio_repetition_detector.h', + 'renderer/media/audio_track_recorder.cc', + 'renderer/media/audio_track_recorder.h', + 'renderer/media/canvas_capture_handler.cc', + 'renderer/media/canvas_capture_handler.h', + 'renderer/media/html_video_element_capturer_source.cc', + 'renderer/media/html_video_element_capturer_source.h', 'renderer/media/media_recorder_handler.cc', 'renderer/media/media_recorder_handler.h', 'renderer/media/media_stream.cc', @@ -636,6 +671,10 @@ 'renderer/media/peer_connection_tracker.h', 'renderer/media/remote_media_stream_impl.cc', 'renderer/media/remote_media_stream_impl.h', + 'renderer/media/rtc_certificate.cc', + 'renderer/media/rtc_certificate.h', + 'renderer/media/rtc_certificate_generator.cc', + 'renderer/media/rtc_certificate_generator.h', 'renderer/media/rtc_data_channel_handler.cc', 'renderer/media/rtc_data_channel_handler.h', 'renderer/media/rtc_dtmf_sender_handler.cc', @@ -661,6 +700,8 @@ 'renderer/media/video_track_recorder.h', 'renderer/media/webaudio_capturer_source.cc', 'renderer/media/webaudio_capturer_source.h', + 'renderer/media/webrtc/media_stream_remote_audio_track.cc', + 'renderer/media/webrtc/media_stream_remote_audio_track.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', @@ -768,19 +809,6 @@ ], }], ['OS=="android"', { - 'sources!': [ - 'renderer/media/audio_decoder.cc', - 'renderer/media/media_recorder_handler.cc', - 'renderer/media/media_recorder_handler.h', - 'renderer/media/video_track_recorder.cc', - 'renderer/media/video_track_recorder.h', - 'renderer/usb/type_converters.cc', - 'renderer/usb/type_converters.h', - 'renderer/usb/web_usb_client_impl.cc', - 'renderer/usb/web_usb_client_impl.h', - 'renderer/usb/web_usb_device_impl.cc', - 'renderer/usb/web_usb_device_impl.h', - ], 'sources': [ 'renderer/external_popup_menu.cc', 'renderer/external_popup_menu.h', @@ -804,8 +832,6 @@ 'renderer/java/gin_java_function_invocation_helper.h', ], 'dependencies': [ - '../device/devices_app/devices_app.gyp:device_usb_mojo_bindings_lib', - '../device/devices_app/devices_app.gyp:devices_app_public_cpp', '../media/cast/cast.gyp:cast_sender', ] }], @@ -813,7 +839,6 @@ 'dependencies': [ '../third_party/libjingle/libjingle.gyp:libjingle_webrtc', '../third_party/libjingle/libjingle.gyp:libpeerconnection', - '../third_party/libyuv/libyuv.gyp:libyuv', '../third_party/webrtc/modules/modules.gyp:audio_device', '../third_party/webrtc/modules/modules.gyp:audio_processing', '../third_party/webrtc/p2p/p2p.gyp:libstunprober', @@ -863,24 +888,24 @@ '../ppapi/ppapi_internal.gyp:ppapi_host', '../ppapi/ppapi_internal.gyp:ppapi_proxy', '../ppapi/ppapi_internal.gyp:ppapi_shared', - '../third_party/libyuv/libyuv.gyp:libyuv', + '../third_party/opus/opus.gyp:opus', ], }], ['enable_pepper_cdms != 1', { 'sources!': [ - '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/cdm/pepper_cdm_wrapper.h', + 'renderer/media/cdm/pepper_cdm_wrapper_impl.cc', + 'renderer/media/cdm/pepper_cdm_wrapper_impl.h', + 'renderer/media/cdm/ppapi_decryptor.cc', + 'renderer/media/cdm/ppapi_decryptor.h', ], }], ['enable_browser_cdms==1', { 'sources': [ - 'renderer/media/crypto/proxy_media_keys.cc', - 'renderer/media/crypto/proxy_media_keys.h', - 'renderer/media/crypto/renderer_cdm_manager.cc', - 'renderer/media/crypto/renderer_cdm_manager.h', + 'renderer/media/cdm/proxy_media_keys.cc', + 'renderer/media/cdm/proxy_media_keys.h', + 'renderer/media/cdm/renderer_cdm_manager.cc', + 'renderer/media/cdm/renderer_cdm_manager.h', ], }], ['use_seccomp_bpf==1', { |