diff options
| -rw-r--r-- | BUILD.gn | 2 | ||||
| -rw-r--r-- | build/config/BUILD.gn | 5 | ||||
| -rw-r--r-- | build/config/features.gni | 4 | ||||
| -rw-r--r-- | content/BUILD.gn | 28 | ||||
| -rw-r--r-- | content/common/BUILD.gn | 12 | ||||
| -rw-r--r-- | content/content_renderer.gypi | 487 | ||||
| -rw-r--r-- | content/public/common/BUILD.gn | 3 | ||||
| -rw-r--r-- | content/public/renderer/BUILD.gn | 30 | ||||
| -rw-r--r-- | content/renderer/BUILD.gn | 176 | ||||
| -rw-r--r-- | content/renderer/renderer.gni | 14 | ||||
| -rw-r--r-- | mojo/public/interfaces/shell/BUILD.gn | 11 | ||||
| -rw-r--r-- | third_party/npapi/BUILD.gn | 24 | ||||
| -rw-r--r-- | ui/native_theme/BUILD.gn | 2 |
13 files changed, 249 insertions, 549 deletions
@@ -33,7 +33,6 @@ group("root") { "//components/translate:translate_core_common", "//components/url_matcher", "//content/public/common", - "//content/public/renderer", "//crypto", "//device/usb", #"//extensions/common/api:extensions_api", @@ -97,7 +96,6 @@ group("root") { if (is_android) { deps -= [ "//content/public/common", - "//content/public/renderer", "//ppapi:ppapi_c", "//third_party/libusb", #"//third_party/WebKit/Source/platform", diff --git a/build/config/BUILD.gn b/build/config/BUILD.gn index 21c54f9..e0b2a2d 100644 --- a/build/config/BUILD.gn +++ b/build/config/BUILD.gn @@ -47,11 +47,6 @@ config("feature_flags") { "V8_DEPRECATION_WARNINGS", # Don't use deprecated V8 APIs anywhere. # Temporary suppression until Blink code can be removed. "BLINK_SCALE_FILTERS_AT_RECORD_TIME", - - # Enable a new Gamepad interface. - # TODO(cdumez): This is temporary and should go away once the chromium - # and blink interfaces are in sync, http://crbug.com/344556. - "ENABLE_NEW_GAMEPAD_API=1", ] if (cld_version > 0) { diff --git a/build/config/features.gni b/build/config/features.gni index f76f42c..f4ec0f8 100644 --- a/build/config/features.gni +++ b/build/config/features.gni @@ -56,7 +56,3 @@ use_seccomp_bpf = (is_linux || is_android) && (cpu_arch == "x86" || cpu_arch == "x64" || cpu_arch == "arm") enable_webrtc = !is_ios - -# Enable notifications everywhere except Android. -# Android is http://crbug.com/115320 -enable_notifications = !is_android diff --git a/content/BUILD.gn b/content/BUILD.gn index acdd32d..5768baf 100644 --- a/content/BUILD.gn +++ b/content/BUILD.gn @@ -2,19 +2,6 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//tools/grit/grit_rule.gni") - -# Applied by targets internal to content. -config("content_implementation") { - defines = [ "CONTENT_IMPLEMENTATION" ] -} - -grit("resources") { - source = "content_resources.grd" -} - -# Stubs ------------------------------------------------------------------------ - # TODO(brettw) remove this and add a proper dependency on blink once that # target has been converted to GN. This config sets up the include directories # so content can compile in the meantime. @@ -31,13 +18,10 @@ config("libjingle_stub_config") { include_dirs = [ "//third_party/libjingle/overrides", "//third_party/libjingle/source", + "//third_party", "//third_party/libyuv/include", "//third_party/usrsctp", - - - "//third_party/webrtc/overrides", # Must be before webrtc abd third_party. "//third_party/webrtc", - "//third_party", ] defines = [ @@ -67,13 +51,3 @@ config("libjingle_stub_config") { } } -# This config is a placeholder to set up the V8 include path while the V8 GN -# build is being worked on. -config("v8_stub_config") { - include_dirs = [ "//v8/include" ] -} - -config("widevine_stub_config") { - # The real implementation does a copy rule to copy the header to the gen dir. - include_dirs = [ "//third_party/widevine/cdm" ] -} diff --git a/content/common/BUILD.gn b/content/common/BUILD.gn index a62b8a8..35d05e7 100644 --- a/content/common/BUILD.gn +++ b/content/common/BUILD.gn @@ -2,10 +2,12 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. +# TODO(brettw) this file is a work in progress, it is not currently hooked up +# to the build, but currently represents the state of content/common's deps. + import("//build/config/features.gni") import("//build/config/ui.gni") import("//content/common/common.gni") -import("//mojo/public/tools/bindings/mojom.gni") source_set("common") { # Only targets in the content tree can depend directly on this target. @@ -21,7 +23,6 @@ source_set("common") { configs += [ "//content:blink_headers_stub_config", - "//content:content_implementation", "//content:libjingle_stub_config", ] @@ -69,8 +70,8 @@ source_set("common") { ] } - defines = [] include_dirs = [] + defines = [ "CONTENT_IMPLEMENTATION" ] libs = [] ldflags = [] @@ -263,8 +264,3 @@ source_set("common") { } } -mojom("mojo_bindings") { - sources = [ - "web_ui_setup.mojom", - ] -} diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi index edfa4c8..311f395 100644 --- a/content/content_renderer.gypi +++ b/content/content_renderer.gypi @@ -323,114 +323,6 @@ 'renderer/mouse_lock_dispatcher.h', 'renderer/notification_provider.cc', 'renderer/notification_provider.h', - 'renderer/push_messaging_dispatcher.cc', - 'renderer/push_messaging_dispatcher.h', - 'renderer/render_frame_impl.cc', - 'renderer/render_frame_impl.h', - 'renderer/render_frame_proxy.cc', - 'renderer/render_frame_proxy.h', - 'renderer/render_process.h', - 'renderer/render_process_impl.cc', - 'renderer/render_process_impl.h', - 'renderer/render_thread_impl.cc', - 'renderer/render_thread_impl.h', - '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_widget.cc', - 'renderer/render_widget.h', - 'renderer/render_widget_fullscreen.cc', - 'renderer/render_widget_fullscreen.h', - 'renderer/renderer_clipboard_client.cc', - 'renderer/renderer_clipboard_client.h', - 'renderer/renderer_date_time_picker.cc', - 'renderer/renderer_date_time_picker.h', - 'renderer/renderer_main.cc', - 'renderer/renderer_main_platform_delegate.h', - 'renderer/renderer_main_platform_delegate_android.cc', - 'renderer/renderer_main_platform_delegate_linux.cc', - 'renderer/renderer_main_platform_delegate_mac.mm', - 'renderer/renderer_main_platform_delegate_win.cc', - 'renderer/renderer_webapplicationcachehost_impl.cc', - 'renderer/renderer_webapplicationcachehost_impl.h', - 'renderer/renderer_webcolorchooser_impl.cc', - 'renderer/renderer_webcolorchooser_impl.h', - 'renderer/renderer_webcookiejar_impl.cc', - 'renderer/renderer_webcookiejar_impl.h', - 'renderer/renderer_webkitplatformsupport_impl.cc', - 'renderer/renderer_webkitplatformsupport_impl.h', - 'renderer/resizing_mode_selector.cc', - 'renderer/resizing_mode_selector.h', - 'renderer/sad_plugin.cc', - 'renderer/sad_plugin.h', - 'renderer/savable_resources.cc', - 'renderer/savable_resources.h', - 'renderer/screen_orientation/mock_screen_orientation_controller.cc', - 'renderer/screen_orientation/mock_screen_orientation_controller.h', - 'renderer/screen_orientation/screen_orientation_dispatcher.cc', - 'renderer/screen_orientation/screen_orientation_dispatcher.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', - 'renderer/service_worker/embedded_worker_context_message_filter.h', - 'renderer/service_worker/embedded_worker_devtools_agent.cc', - '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_script_context.cc', - 'renderer/service_worker/service_worker_script_context.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_stub.cc', - 'renderer/shared_worker/embedded_shared_worker_stub.h', - 'renderer/skia_benchmarking_extension.cc', - 'renderer/skia_benchmarking_extension.h', - 'renderer/speech_recognition_dispatcher.cc', - 'renderer/speech_recognition_dispatcher.h', - 'renderer/stats_collection_controller.cc', - 'renderer/stats_collection_controller.h', - 'renderer/stats_collection_observer.cc', - '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_preferences.cc', - '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/web_ui_setup_impl.cc', - 'renderer/web_ui_setup_impl.h', - 'renderer/webclipboard_impl.cc', - 'renderer/webclipboard_impl.h', - 'renderer/webgraphicscontext3d_provider_impl.cc', - 'renderer/webgraphicscontext3d_provider_impl.h', - 'renderer/webpublicsuffixlist_impl.cc', - '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/websharedworker_proxy.cc', - 'renderer/websharedworker_proxy.h', - ], - 'private_renderer_plugin_sources': [ 'renderer/npapi/plugin_channel_host.cc', 'renderer/npapi/plugin_channel_host.h', 'renderer/npapi/webplugin_delegate_proxy.cc', @@ -559,140 +451,114 @@ 'renderer/pepper/usb_key_code_conversion_win.cc', 'renderer/pepper/v8_var_converter.cc', 'renderer/pepper/v8_var_converter.h', + 'renderer/push_messaging_dispatcher.cc', + 'renderer/push_messaging_dispatcher.h', + 'renderer/render_frame_impl.cc', + 'renderer/render_frame_impl.h', + 'renderer/render_frame_proxy.cc', + 'renderer/render_frame_proxy.h', + 'renderer/render_process.h', + 'renderer/render_process_impl.cc', + 'renderer/render_process_impl.h', + 'renderer/render_thread_impl.cc', + 'renderer/render_thread_impl.h', + '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_widget.cc', + 'renderer/render_widget.h', + 'renderer/render_widget_fullscreen.cc', + 'renderer/render_widget_fullscreen.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_audio_sink.cc', - 'public/renderer/media_stream_sink.h', - 'public/renderer/media_stream_video_sink.cc', - 'public/renderer/media_stream_video_sink.h', - 'public/renderer/webrtc_log_message_delegate.h', - ], - 'private_renderer_webrtc_sources': [ - 'renderer/media/media_stream.h', - 'renderer/media/media_stream.cc', - '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_track_sink.h', - 'renderer/media/media_stream_center.cc', - 'renderer/media/media_stream_dispatcher.cc', - 'renderer/media/media_stream_impl.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', - 'renderer/media/media_stream_source.h', - 'renderer/media/media_stream_video_capturer_source.cc', - 'renderer/media/media_stream_video_capturer_source.h', - 'renderer/media/media_stream_video_source.cc', - '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', - 'renderer/media/peer_connection_tracker.h', - 'renderer/media/remote_media_stream_impl.cc', - 'renderer/media/remote_media_stream_impl.h', - 'renderer/media/rtc_data_channel_handler.cc', - 'renderer/media/rtc_data_channel_handler.h', - 'renderer/media/rtc_dtmf_sender_handler.cc', - 'renderer/media/rtc_dtmf_sender_handler.h', - 'renderer/media/rtc_media_constraints.cc', - 'renderer/media/rtc_media_constraints.h', - 'renderer/media/rtc_peer_connection_handler.cc', - 'renderer/media/rtc_peer_connection_handler.h', - 'renderer/media/rtc_video_decoder.cc', - 'renderer/media/rtc_video_decoder.h', - 'renderer/media/rtc_video_decoder_factory.cc', - 'renderer/media/rtc_video_decoder_factory.h', - 'renderer/media/rtc_video_encoder.cc', - 'renderer/media/rtc_video_encoder.h', - 'renderer/media/rtc_video_encoder_factory.cc', - 'renderer/media/rtc_video_encoder_factory.h', - 'renderer/media/rtc_video_renderer.cc', - 'renderer/media/rtc_video_renderer.h', - 'renderer/media/video_frame_deliverer.cc', - 'renderer/media/video_frame_deliverer.h', - 'renderer/media/video_source_handler.cc', - 'renderer/media/video_source_handler.h', - 'renderer/media/video_track_adapter.cc', - '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/video_destination_handler.cc', - 'renderer/media/webrtc/video_destination_handler.h', - 'renderer/media/webrtc/webrtc_audio_sink_adapter.cc', - 'renderer/media/webrtc/webrtc_audio_sink_adapter.h', - 'renderer/media/webrtc/webrtc_local_audio_track_adapter.cc', - 'renderer/media/webrtc/webrtc_local_audio_track_adapter.h', - 'renderer/media/webrtc/webrtc_media_stream_adapter.cc', - '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_audio_capturer.cc', - 'renderer/media/webrtc_audio_capturer.h', - 'renderer/media/webrtc_audio_device_impl.cc', - 'renderer/media/webrtc_audio_device_impl.h', - 'renderer/media/webrtc_audio_device_not_impl.cc', - 'renderer/media/webrtc_audio_device_not_impl.h', - 'renderer/media/webrtc_audio_renderer.cc', - 'renderer/media/webrtc_audio_renderer.h', - 'renderer/media/webrtc_identity_service.cc', - 'renderer/media/webrtc_identity_service.h', - 'renderer/media/webrtc_local_audio_renderer.cc', - 'renderer/media/webrtc_local_audio_renderer.h', - 'renderer/media/webrtc_local_audio_source_provider.cc', - 'renderer/media/webrtc_local_audio_source_provider.h', - 'renderer/media/webrtc_local_audio_track.cc', - 'renderer/media/webrtc_local_audio_track.h', - 'renderer/media/webrtc_logging.cc', - 'renderer/media/webrtc_logging.h', - 'renderer/media/webrtc_uma_histograms.cc', - 'renderer/media/webrtc_uma_histograms.h', - 'renderer/p2p/host_address_request.cc', - 'renderer/p2p/host_address_request.h', - 'renderer/p2p/ipc_network_manager.cc', - 'renderer/p2p/ipc_network_manager.h', - 'renderer/p2p/ipc_socket_factory.cc', - 'renderer/p2p/ipc_socket_factory.h', - 'renderer/p2p/network_list_observer.h', - 'renderer/p2p/port_allocator.cc', - 'renderer/p2p/port_allocator.h', - 'renderer/p2p/socket_client_impl.cc', - 'renderer/p2p/socket_client_impl.h', - 'renderer/p2p/socket_dispatcher.cc', - 'renderer/p2p/socket_dispatcher.h', - 'renderer/pepper/pepper_media_stream_audio_track_host.cc', - 'renderer/pepper/pepper_media_stream_audio_track_host.h', - 'renderer/pepper/pepper_media_stream_track_host_base.cc', - 'renderer/pepper/pepper_media_stream_track_host_base.h', - 'renderer/pepper/pepper_media_stream_video_track_host.cc', - 'renderer/pepper/pepper_media_stream_video_track_host.h', - 'renderer/pepper/pepper_video_destination_host.cc', - 'renderer/pepper/pepper_video_destination_host.h', - 'renderer/pepper/pepper_video_source_host.cc', - 'renderer/pepper/pepper_video_source_host.h', + 'renderer/renderer_clipboard_client.cc', + 'renderer/renderer_clipboard_client.h', + 'renderer/renderer_date_time_picker.cc', + 'renderer/renderer_date_time_picker.h', + 'renderer/renderer_main.cc', + 'renderer/renderer_main_platform_delegate.h', + 'renderer/renderer_main_platform_delegate_android.cc', + 'renderer/renderer_main_platform_delegate_linux.cc', + 'renderer/renderer_main_platform_delegate_mac.mm', + 'renderer/renderer_main_platform_delegate_win.cc', + 'renderer/renderer_webapplicationcachehost_impl.cc', + 'renderer/renderer_webapplicationcachehost_impl.h', + 'renderer/renderer_webcolorchooser_impl.cc', + 'renderer/renderer_webcolorchooser_impl.h', + 'renderer/renderer_webcookiejar_impl.cc', + 'renderer/renderer_webcookiejar_impl.h', + 'renderer/renderer_webkitplatformsupport_impl.cc', + 'renderer/renderer_webkitplatformsupport_impl.h', + 'renderer/resizing_mode_selector.cc', + 'renderer/resizing_mode_selector.h', + 'renderer/sad_plugin.cc', + 'renderer/sad_plugin.h', + 'renderer/savable_resources.cc', + 'renderer/savable_resources.h', + 'renderer/screen_orientation/mock_screen_orientation_controller.cc', + 'renderer/screen_orientation/mock_screen_orientation_controller.h', + 'renderer/screen_orientation/screen_orientation_dispatcher.cc', + 'renderer/screen_orientation/screen_orientation_dispatcher.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', + 'renderer/service_worker/embedded_worker_context_message_filter.h', + 'renderer/service_worker/embedded_worker_devtools_agent.cc', + '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_script_context.cc', + 'renderer/service_worker/service_worker_script_context.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_stub.cc', + 'renderer/shared_worker/embedded_shared_worker_stub.h', + 'renderer/skia_benchmarking_extension.cc', + 'renderer/skia_benchmarking_extension.h', + 'renderer/speech_recognition_dispatcher.cc', + 'renderer/speech_recognition_dispatcher.h', + 'renderer/stats_collection_controller.cc', + 'renderer/stats_collection_controller.h', + 'renderer/stats_collection_observer.cc', + '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_preferences.cc', + '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/web_ui_setup_impl.cc', + 'renderer/web_ui_setup_impl.h', + 'renderer/webclipboard_impl.cc', + 'renderer/webclipboard_impl.h', + 'renderer/webgraphicscontext3d_provider_impl.cc', + 'renderer/webgraphicscontext3d_provider_impl.h', + 'renderer/webpublicsuffixlist_impl.cc', + '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/websharedworker_proxy.cc', + 'renderer/websharedworker_proxy.h', ] }, 'sources': [ @@ -776,8 +642,134 @@ '<(DEPTH)/crypto/crypto.gyp:crypto', ], 'sources': [ - '<@(public_renderer_webrtc_sources)', - '<@(private_renderer_webrtc_sources)', + 'public/renderer/media_stream_audio_sink.h', + 'public/renderer/media_stream_audio_sink.cc', + 'public/renderer/media_stream_sink.h', + 'public/renderer/media_stream_video_sink.cc', + 'public/renderer/media_stream_video_sink.h', + 'public/renderer/webrtc_log_message_delegate.h', + 'renderer/media/media_stream.h', + 'renderer/media/media_stream.cc', + '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_track_sink.h', + 'renderer/media/media_stream_center.cc', + 'renderer/media/media_stream_dispatcher.cc', + 'renderer/media/media_stream_impl.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.h', + 'renderer/media/media_stream_renderer_factory.cc', + 'renderer/media/media_stream_source.cc', + 'renderer/media/media_stream_source.h', + 'renderer/media/media_stream_video_capturer_source.cc', + 'renderer/media/media_stream_video_capturer_source.h', + 'renderer/media/media_stream_video_source.cc', + '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', + 'renderer/media/peer_connection_tracker.h', + 'renderer/media/remote_media_stream_impl.cc', + 'renderer/media/remote_media_stream_impl.h', + 'renderer/media/rtc_data_channel_handler.cc', + 'renderer/media/rtc_data_channel_handler.h', + 'renderer/media/rtc_dtmf_sender_handler.cc', + 'renderer/media/rtc_dtmf_sender_handler.h', + 'renderer/media/rtc_media_constraints.cc', + 'renderer/media/rtc_media_constraints.h', + 'renderer/media/rtc_peer_connection_handler.cc', + 'renderer/media/rtc_peer_connection_handler.h', + 'renderer/media/rtc_video_decoder.cc', + 'renderer/media/rtc_video_decoder.h', + 'renderer/media/rtc_video_decoder_factory.cc', + 'renderer/media/rtc_video_decoder_factory.h', + 'renderer/media/rtc_video_encoder.cc', + 'renderer/media/rtc_video_encoder.h', + 'renderer/media/rtc_video_encoder_factory.cc', + 'renderer/media/rtc_video_encoder_factory.h', + 'renderer/media/rtc_video_renderer.cc', + 'renderer/media/rtc_video_renderer.h', + 'renderer/media/video_frame_deliverer.cc', + 'renderer/media/video_frame_deliverer.h', + 'renderer/media/video_source_handler.cc', + 'renderer/media/video_source_handler.h', + 'renderer/media/video_track_adapter.cc', + '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/video_destination_handler.cc', + 'renderer/media/webrtc/video_destination_handler.h', + 'renderer/media/webrtc/webrtc_audio_sink_adapter.cc', + 'renderer/media/webrtc/webrtc_audio_sink_adapter.h', + 'renderer/media/webrtc/webrtc_local_audio_track_adapter.cc', + 'renderer/media/webrtc/webrtc_local_audio_track_adapter.h', + 'renderer/media/webrtc/webrtc_media_stream_adapter.cc', + '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_audio_capturer.cc', + 'renderer/media/webrtc_audio_capturer.h', + 'renderer/media/webrtc_audio_device_impl.cc', + 'renderer/media/webrtc_audio_device_impl.h', + 'renderer/media/webrtc_audio_device_not_impl.cc', + 'renderer/media/webrtc_audio_device_not_impl.h', + 'renderer/media/webrtc_audio_renderer.cc', + 'renderer/media/webrtc_audio_renderer.h', + 'renderer/media/webrtc_identity_service.cc', + 'renderer/media/webrtc_identity_service.h', + 'renderer/media/webrtc_local_audio_renderer.cc', + 'renderer/media/webrtc_local_audio_renderer.h', + 'renderer/media/webrtc_local_audio_source_provider.cc', + 'renderer/media/webrtc_local_audio_source_provider.h', + 'renderer/media/webrtc_local_audio_track.cc', + 'renderer/media/webrtc_local_audio_track.h', + 'renderer/media/webrtc_logging.cc', + 'renderer/media/webrtc_logging.h', + 'renderer/media/webrtc_uma_histograms.cc', + 'renderer/media/webrtc_uma_histograms.h', + 'renderer/p2p/host_address_request.cc', + 'renderer/p2p/host_address_request.h', + 'renderer/p2p/ipc_network_manager.cc', + 'renderer/p2p/ipc_network_manager.h', + 'renderer/p2p/ipc_socket_factory.cc', + 'renderer/p2p/ipc_socket_factory.h', + 'renderer/p2p/network_list_observer.h', + 'renderer/p2p/port_allocator.cc', + 'renderer/p2p/port_allocator.h', + 'renderer/p2p/socket_client_impl.cc', + 'renderer/p2p/socket_client_impl.h', + 'renderer/p2p/socket_dispatcher.cc', + 'renderer/p2p/socket_dispatcher.h', + 'renderer/pepper/pepper_media_stream_audio_track_host.cc', + 'renderer/pepper/pepper_media_stream_audio_track_host.h', + 'renderer/pepper/pepper_media_stream_track_host_base.cc', + 'renderer/pepper/pepper_media_stream_track_host_base.h', + 'renderer/pepper/pepper_media_stream_video_track_host.cc', + 'renderer/pepper/pepper_media_stream_video_track_host.h', + 'renderer/pepper/pepper_video_destination_host.cc', + 'renderer/pepper/pepper_video_destination_host.h', + 'renderer/pepper/pepper_video_source_host.cc', + 'renderer/pepper/pepper_video_source_host.h', ], },{ # enable_webrtc==0 'sources': [ @@ -786,19 +778,22 @@ ], }], ['enable_plugins==1', { - 'sources': [ - '<@(private_renderer_plugin_sources)', - ], 'dependencies': [ '../ppapi/ppapi_internal.gyp:ppapi_host', '../ppapi/ppapi_internal.gyp:ppapi_proxy', '../ppapi/ppapi_internal.gyp:ppapi_shared', ], }, { # enable_plugins==0 + 'sources/': [ + ['exclude', '^renderer/npapi/'], + ['exclude', '^renderer/pepper/'], + ], 'sources!': [ - # These are not in the plugins sources list since it also requires webrtc. + 'renderer/media/pepper_platform_video_decoder.cc', 'renderer/media/webrtc/video_destination_handler.cc', 'renderer/media/webrtc/video_destination_handler.h', + 'renderer/render_widget_fullscreen_pepper.cc', + 'renderer/render_widget_fullscreen_pepper.h', ], }], ['enable_pepper_cdms != 1', { diff --git a/content/public/common/BUILD.gn b/content/public/common/BUILD.gn index 8bef0b6..562bf6d 100644 --- a/content/public/common/BUILD.gn +++ b/content/public/common/BUILD.gn @@ -8,8 +8,9 @@ source_set("common") { sources = rebase_path(content_common_gypi_values.public_common_sources, ".", "//content") + defines = [ "CONTENT_IMPLEMENTATION" ] + configs += [ - "//content:content_implementation", # TODO(GYP) remove when blink_headers target is converted. "//content:blink_headers_stub_config", ] diff --git a/content/public/renderer/BUILD.gn b/content/public/renderer/BUILD.gn deleted file mode 100644 index f4a51dd..0000000 --- a/content/public/renderer/BUILD.gn +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 2014 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -import("//build/config/features.gni") -import("//content/renderer/renderer.gni") - -source_set("renderer") { - sources = rebase_path(content_renderer_gypi_values.public_renderer_sources, - ".", "//content") - - configs += [ - "//content:blink_headers_stub_config", - "//content:content_implementation", - "//content:libjingle_stub_config", - "//content:v8_stub_config", - "//content:widevine_stub_config", - ] - - deps = [ - "//content/renderer", - "//skia", - ] - - if (enable_webrtc) { - sources += rebase_path( - content_renderer_gypi_values.public_renderer_webrtc_sources, - ".", "//content") - } -} diff --git a/content/renderer/BUILD.gn b/content/renderer/BUILD.gn deleted file mode 100644 index 55e56cf..0000000 --- a/content/renderer/BUILD.gn +++ /dev/null @@ -1,176 +0,0 @@ -# Copyright 2014 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -import("//build/config/features.gni") -import("//build/config/ui.gni") -import("//content/renderer/renderer.gni") - -source_set("renderer") { - # Only targets in the content tree can depend directly on this target. - visibility = [ "//content/*" ] - - sources = rebase_path(content_renderer_gypi_values.private_renderer_sources, - ".", "//content") - - configs += [ - "//content:blink_headers_stub_config", - "//content:content_implementation", - "//content:libjingle_stub_config", - "//content:v8_stub_config", - "//content:widevine_stub_config", - ] - - deps = [ - # TODO(GYP) bug 376846 remove this. This should be inherited from //net but - # those don't cross component boundaries. - "//crypto:platform", - - "//base/allocator", - "//content:resources", - "//content/common:mojo_bindings", - "//gin", - "//mojo/public/js/bindings", - "//mojo/public/interfaces/service_provider", - "//net", - "//skia", - "//third_party/icu", - "//third_party/npapi", - "//ui/accessibility", - "//ui/events:dom4_keycode_converter", - "//ui/native_theme", - "//ui/surface", - # TODO(GYP) - #'../jingle/jingle.gyp:jingle_glue', - #'../media/media.gyp:media', - #'../mojo/mojo.gyp:mojo_environment_chromium', - #'../third_party/WebKit/public/blink.gyp:blink', - #'../third_party/libjingle/libjingle.gyp:libjingle', - #'../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h', - #'../v8/tools/gyp/v8.gyp:v8', - #'../webkit/child/webkit_child.gyp:webkit_child', - #'../webkit/common/gpu/webkit_gpu.gyp:webkit_gpu', - #'../webkit/common/webkit_common.gyp:webkit_common', - #'../webkit/renderer/compositor_bindings/compositor_bindings.gyp:webkit_compositor_bindings', - #'../webkit/renderer/compositor_bindings/compositor_bindings.gyp:webkit_compositor_support', - #'../webkit/storage_common.gyp:webkit_storage_common', - ] - - if (!enable_notifications) { - sources -= [ - "notification_provider.cc", - "active_notification_tracker.cc", - ] - } - - if (is_mac) { - sources -= [ - "webscrollbarbehavior_impl_gtkoraura.cc", - "webscrollbarbehavior_impl_gtkoraura.h", - ] - sources += [ - "external_popup_menu.cc", - "external_popup_menu.h", - ] - } - - if (is_android) { - sources -= [ - "accessibility/renderer_accessibility_focus_only.cc", - "media/audio_decoder.cc", - "media/filter_helpers.cc", - "media/webmediaplayer_impl.cc", - ] - sources += [ - "external_popup_menu.cc", - "external_popup_menu.h", - ] - - # Add back the Linux file which Android shares. - set_sources_assignment_filter([]) - sources += [ - "render_view_linux.cc", - ] - - deps += [ - "//third_party/android_tools:cpu_features", - # TODO(GYP) - #"//third_party/libphonenumber", - ] - } else { - sources -= [ - "java/java_bridge_channel.cc", - "java/java_bridge_channel.h", - "java/java_bridge_dispatcher.cc", - "java/java_bridge_dispatcher.h", - ] - } - - # TODO(jrg): remove the OS=="android" section? - # http://crbug.com/113172 - # Understand better how media_stream_ is tied into Chromium. - if (!enable_webrtc && is_android) { - sources -= [ - "media/media_stream_audio_level_calculator.cc", - "media/media_stream_audio_level_calculator.h", - "media/media_stream_audio_renderer.cc", - "media/media_stream_audio_renderer.h", - "media/media_stream_center.h", - "media/media_stream_client.h", - "media/media_stream_constraints_util.cc", - "media/media_stream_constraints_util.h", - "media/media_stream_dispatcher.h", - "media/media_stream_dispatcher_eventhandler.h", - "media/media_stream_impl.h", - "media/media_stream_track.cc", - "media/media_stream_track.h", - ] - } - - if (enable_webrtc) { - sources += rebase_path( - content_renderer_gypi_values.private_renderer_webrtc_sources, - ".", "//content") - deps += [ - "//crypto", - # TODO(GYP) - #"../third_party/libjingle/libjingle.gyp:libjingle_webrtc", - #"../third_party/libjingle/libjingle.gyp:libpeerconnection", - #"../third_party/webrtc/modules/modules.gyp:audio_device", - #"../third_party/webrtc/modules/modules.gyp:audio_processing", - #"//third_party/libyuv", - ] - } else { - sources += [ - "media/webrtc_logging_noop.cc", - "media/webrtc_logging.h", - ] - } - - if (enable_plugins) { - sources += rebase_path( - content_renderer_gypi_values.private_renderer_plugin_sources, - ".", "//content") - deps += [ - # TODO(GYP) - #"//ppapi/ppapi_internal.gyp:ppapi_host", - #"//ppapi/ppapi_internal.gyp:ppapi_proxy", - #"//ppapi/ppapi_internal.gyp:ppapi_shared", - ] - } else { - # These files are in the WebRTC list, but also require plugins. - if (enable_webrtc) { - sources -= [ - "media/webrtc/video_destination_handler.cc", - "media/webrtc/video_destination_handler.h", - ] - } - } - - if (!enable_pepper_cdms) { - sources -= [ - "renderer/media/crypto/ppapi_decryptor.cc", - "renderer/media/crypto/ppapi_decryptor.h", - ] - } -} diff --git a/content/renderer/renderer.gni b/content/renderer/renderer.gni deleted file mode 100644 index 2b63889..0000000 --- a/content/renderer/renderer.gni +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright 2014 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -# This file defines the content renderer gypi values. This file is read once -# and cached, which is a performance optimization that allows us to share the -# results of parsing the .gypi file between the public and private BUILD.gn -# files. It also saves us from duplicating this exec_script call. -content_renderer_gypi_values = exec_script( - "//build/gypi_to_gn.py", - [ rebase_path("../content_renderer.gypi") ], - "scope", - [ "../content_renderer.gypi" ]) - diff --git a/mojo/public/interfaces/shell/BUILD.gn b/mojo/public/interfaces/shell/BUILD.gn deleted file mode 100644 index c11ae70..0000000 --- a/mojo/public/interfaces/shell/BUILD.gn +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright 2014 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -import("//mojo/public/tools/bindings/mojom.gni") - -mojom("shell") { - sources = [ - "shell.mojom", - ] -} diff --git a/third_party/npapi/BUILD.gn b/third_party/npapi/BUILD.gn deleted file mode 100644 index 646b80a..0000000 --- a/third_party/npapi/BUILD.gn +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 2014 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -config("npapi_config") { - # Some things #include "bindings/npapi.h" and others just #include - # "npapi.h". Account for both flavors. - include_dirs = [ ".", "bindings" ] -} - -source_set("npapi") { - # Just headers but this allows us to track dependencies on these. - sources = [ - "bindings/npapi.h", - "bindings/npapi_extensions.h", - "bindings/npapi_x11.h", - "bindings/npfunctions.h", - "bindings/nphostapi.h", - "bindings/nptypes.h", - "bindings/npruntime.h", - ] - - direct_dependent_configs = [ ":npapi_config" ] -} diff --git a/ui/native_theme/BUILD.gn b/ui/native_theme/BUILD.gn index 8807bde..2398ed9 100644 --- a/ui/native_theme/BUILD.gn +++ b/ui/native_theme/BUILD.gn @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//build/config/ui.gni") +import ("//build/config/ui.gni") component("native_theme") { sources = [ |