diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-07-31 15:50:41 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-08-30 12:35:23 +0000 |
commit | 7b2ffa587235a47d4094787d72f38102089f402a (patch) | |
tree | 30e82af9cbab08a7fa028bb18f4f2987a3f74dfa /chromium/content/common/BUILD.gn | |
parent | d94af01c90575348c4e81a418257f254b6f8d225 (diff) | |
download | qtwebengine-chromium-7b2ffa587235a47d4094787d72f38102089f402a.tar.gz |
BASELINE: Update Chromium to 76.0.3809.94
Change-Id: I321c3f5f929c105aec0f98c5091ef6108822e647
Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/content/common/BUILD.gn')
-rw-r--r-- | chromium/content/common/BUILD.gn | 67 |
1 files changed, 52 insertions, 15 deletions
diff --git a/chromium/content/common/BUILD.gn b/chromium/content/common/BUILD.gn index 775996a26f5..a5a15ca2363 100644 --- a/chromium/content/common/BUILD.gn +++ b/chromium/content/common/BUILD.gn @@ -13,6 +13,7 @@ import("//tools/ipc_fuzzer/ipc_fuzzer.gni") import("features.gni") if (is_mac) { import("//build/config/mac/mac_sdk.gni") + import("//content/public/app/mac_helpers.gni") } # For feature flags internal to content. See content/public/common:features @@ -42,6 +43,8 @@ source_set("common") { "android/gin_java_bridge_value.h", "android/hash_set.cc", "android/hash_set.h", + "android/surface_wrapper.cc", + "android/surface_wrapper.h", "android/sync_compositor_statics.cc", "android/sync_compositor_statics.h", "android/use_zoom_for_dsf_policy_android.cc", @@ -92,7 +95,6 @@ source_set("common") { "cursors/webcursor_aurax11.cc", "cursors/webcursor_mac.mm", "cursors/webcursor_ozone.cc", - "date_time_suggestion.h", "dom_storage/dom_storage_map.cc", "dom_storage/dom_storage_map.h", "dom_storage/dom_storage_messages.h", @@ -189,8 +191,6 @@ source_set("common") { "navigation_gesture.h", "navigation_params.cc", "navigation_params.h", - "navigation_subresource_loader_params.cc", - "navigation_subresource_loader_params.h", "net/record_load_histograms.cc", "net/record_load_histograms.h", "net/url_request_service_worker_data.cc", @@ -211,6 +211,8 @@ source_set("common") { "possibly_associated_interface_ptr.h", "possibly_associated_interface_ptr_info.h", "possibly_associated_wrapper_shared_url_loader_factory.h", + "prefetched_signed_exchange_info.cc", + "prefetched_signed_exchange_info.h", "process_type.cc", "render_widget_surface_properties.cc", "render_widget_surface_properties.h", @@ -364,7 +366,10 @@ source_set("common") { } if (is_mac) { - deps += [ "//sandbox/mac:seatbelt" ] + deps += [ + ":mac_helpers", + "//sandbox/mac:seatbelt", + ] } if (is_android) { @@ -480,7 +485,6 @@ mojom("mojo_bindings") { "input/input_handler.mojom", "input/input_injector.mojom", "input/synchronous_compositor.mojom", - "manifest_observer.mojom", "media/peer_connection_tracker.mojom", "media/renderer_audio_input_stream_factory.mojom", "media/renderer_audio_output_stream_factory.mojom", @@ -488,23 +492,14 @@ mojom("mojo_bindings") { "navigation_client.mojom", "navigation_params.mojom", "page_state.mojom", - "push_messaging.mojom", "render_frame_message_filter.mojom", "render_frame_metadata.mojom", "render_message_filter.mojom", - "render_widget_window_tree_client_factory.mojom", "renderer.mojom", "renderer_host.mojom", "widget.mojom", ] - if (is_mac) { - sources += [ - "render_widget_host_ns_view.mojom", - "sandbox_support_mac.mojom", - ] - } - enabled_features = [] if (enable_ipc_logging) { enabled_features += [ "ipc_logging" ] @@ -530,13 +525,14 @@ mojom("mojo_bindings") { "//services/viz/public/interfaces", "//services/ws/public/mojom", "//skia/public/interfaces", - "//third_party/blink/public:mojo_bindings", "//third_party/blink/public/mojom:mojom_core", + "//third_party/blink/public/mojom:web_bluetooth_mojo_bindings", "//third_party/blink/public/mojom:web_feature_mojo_bindings", "//ui/base/ime/mojo", "//ui/base/mojo", "//ui/events/mojo:interfaces", "//ui/gfx/geometry/mojo", + "//ui/gfx/image/mojo:interfaces", "//ui/gfx/mojo", "//ui/gfx/range/mojo", "//ui/latency/mojo:interfaces", @@ -544,6 +540,15 @@ mojom("mojo_bindings") { "//url/mojom:url_mojom_origin", ] + if (is_mac) { + sources += [ + "render_widget_host_ns_view.mojom", + "sandbox_support_mac.mojom", + "web_contents_ns_view_bridge.mojom", + ] + public_deps += [ "//ui/display/mojo:interfaces" ] + } + overridden_deps = [ "//third_party/blink/public/mojom:mojom_core" ] component_deps = [ "//third_party/blink/public/common" ] @@ -552,3 +557,35 @@ mojom("mojo_bindings") { export_define = "CONTENT_IMPLEMENTATION=1" export_header = "content/common/content_export.h" } + +if (is_mac) { + source_set("mac_helpers") { + _lines = [ + "// This file is generated by " + + get_label_info(target_name, "label_no_toolchain"), + "", + "#ifndef GEN_CONTENT_COMMON_MAC_HELPERS_H_", + "#define GEN_CONTENT_COMMON_MAC_HELPERS_H_", + "", + "namespace content {", + "", + ] + foreach(helper_params, content_mac_helpers) { + _lines += [ "const char kMacHelperSuffix_${helper_params[0]}[] = \"${helper_params[2]}\";" ] + } + _lines += [ + "", + "} // namespace content", + "", + "#endif // GEN_CONTENT_COMMON_MAC_HELPERS_H_", + ] + + _file = "$target_gen_dir/mac_helpers.h" + + write_file(_file, _lines) + + sources = [ + _file, + ] + } +} |