summaryrefslogtreecommitdiff
path: root/chromium/content/common/BUILD.gn
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2017-04-05 14:08:31 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2017-04-11 07:46:53 +0000
commit6a4cabb866f66d4128a97cdc6d9d08ce074f1247 (patch)
treeab00f70a5e89278d6a0d16ff0c42578dc4d84a2d /chromium/content/common/BUILD.gn
parente733310db58160074f574c429d48f8308c0afe17 (diff)
downloadqtwebengine-chromium-6a4cabb866f66d4128a97cdc6d9d08ce074f1247.tar.gz
BASELINE: Update Chromium to 57.0.2987.144
Change-Id: I29db402ff696c71a04c4dbaec822c2e53efe0267 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Diffstat (limited to 'chromium/content/common/BUILD.gn')
-rw-r--r--chromium/content/common/BUILD.gn43
1 files changed, 20 insertions, 23 deletions
diff --git a/chromium/content/common/BUILD.gn b/chromium/content/common/BUILD.gn
index fb3c102a8b6..2686a330ab8 100644
--- a/chromium/content/common/BUILD.gn
+++ b/chromium/content/common/BUILD.gn
@@ -6,6 +6,8 @@ import("//build/config/features.gni")
import("//build/config/ui.gni")
import("//media/media_options.gni")
import("//mojo/public/tools/bindings/mojom.gni")
+import("//ppapi/features/features.gni")
+import("//sandbox/features.gni")
import("//tools/ipc_fuzzer/ipc_fuzzer.gni")
if (is_mac) {
import("//build/config/mac/mac_sdk.gni")
@@ -96,6 +98,8 @@ source_set("common") {
"dom_storage/dom_storage_map.cc",
"dom_storage/dom_storage_map.h",
"dom_storage/dom_storage_messages.h",
+ "download/mhtml_save_status.cc",
+ "download/mhtml_save_status.h",
"drag_event_source_info.h",
"drag_messages.h",
"drag_traits.h",
@@ -121,34 +125,25 @@ source_set("common") {
"frame_owner_properties.h",
"frame_replication_state.cc",
"frame_replication_state.h",
- "gamepad_hardware_buffer.h",
- "gamepad_messages.h",
- "gamepad_param_traits.cc",
- "gamepad_param_traits.h",
"generic_shared_memory_id_generator.cc",
"generic_shared_memory_id_generator.h",
"gin_java_bridge_messages.h",
- "gpu/client/command_buffer_metrics.cc",
- "gpu/client/command_buffer_metrics.h",
- "gpu/client/context_provider_command_buffer.cc",
- "gpu/client/context_provider_command_buffer.h",
"gpu_host_messages.h",
"host_shared_bitmap_manager.cc",
"host_shared_bitmap_manager.h",
"in_process_child_thread_params.cc",
"in_process_child_thread_params.h",
"indexed_db/indexed_db_constants.h",
+ "indexed_db/indexed_db_enum_traits.cc",
+ "indexed_db/indexed_db_enum_traits.h",
"indexed_db/indexed_db_key.cc",
"indexed_db/indexed_db_key.h",
"indexed_db/indexed_db_key_path.cc",
"indexed_db/indexed_db_key_path.h",
"indexed_db/indexed_db_key_range.cc",
"indexed_db/indexed_db_key_range.h",
- "indexed_db/indexed_db_messages.h",
"indexed_db/indexed_db_metadata.cc",
"indexed_db/indexed_db_metadata.h",
- "indexed_db/indexed_db_param_traits.cc",
- "indexed_db/indexed_db_param_traits.h",
"indexed_db/indexed_db_struct_traits.cc",
"indexed_db/indexed_db_struct_traits.h",
"input/event_with_latency_info.cc",
@@ -172,6 +167,8 @@ source_set("common") {
"input/synthetic_gesture_params.h",
"input/synthetic_pinch_gesture_params.cc",
"input/synthetic_pinch_gesture_params.h",
+ "input/synthetic_pointer_action_list_params.cc",
+ "input/synthetic_pointer_action_list_params.h",
"input/synthetic_pointer_action_params.cc",
"input/synthetic_pointer_action_params.h",
"input/synthetic_smooth_drag_gesture_params.cc",
@@ -245,6 +242,11 @@ source_set("common") {
"plugin_list.h",
"process_type.cc",
"push_messaging_messages.h",
+ "quarantine/quarantine.cc",
+ "quarantine/quarantine_constants_linux.h",
+ "quarantine/quarantine_linux.cc",
+ "quarantine/quarantine_mac.mm",
+ "quarantine/quarantine_win.cc",
"quota_messages.h",
"render_process_messages.h",
"resize_params.cc",
@@ -286,8 +288,6 @@ source_set("common") {
"sandbox_win.cc",
"sandbox_win.h",
"savable_subframe.h",
- "savable_url_schemes.cc",
- "savable_url_schemes.h",
"screen_orientation_messages.h",
"send_zygote_child_ping_linux.cc",
"service_manager/embedded_service_runner.cc",
@@ -346,15 +346,13 @@ source_set("common") {
"//third_party/WebKit/public:blink_headers",
]
deps = [
- # This looks needless as we have :mojo_bindings in public_deps, but it's
- # needed because of allow_circular_includes_from.
- ":mojo_bindings_cpp_sources",
"//base",
"//base/third_party/dynamic_annotations",
"//build/util:webkit_version",
"//cc/ipc",
"//cc/surfaces",
"//components/discardable_memory/common",
+ "//components/payments:payment_app",
"//components/tracing",
"//components/tracing:startup_tracing",
"//content:resources",
@@ -381,11 +379,13 @@ source_set("common") {
"//media/gpu/ipc/client",
"//media/gpu/ipc/common",
"//media/midi",
- "//media/midi:mojo_cpp_sources",
+ "//media/midi:mojo",
"//mojo/common:common_base",
"//mojo/edk/system",
"//net",
+ "//ppapi/features",
"//sandbox",
+ "//sandbox:sandbox_features",
"//services/service_manager",
"//services/service_manager/public/cpp",
"//services/service_manager/public/interfaces",
@@ -422,7 +422,7 @@ source_set("common") {
libs = []
ldflags = []
- allow_circular_includes_from = [ ":mojo_bindings_cpp_sources" ]
+ allow_circular_includes_from = [ ":mojo_bindings" ]
if (is_android && use_seccomp_bpf) {
set_sources_assignment_filter([])
@@ -497,9 +497,7 @@ source_set("common") {
sources -= [ "cursors/webcursor_aurawin.cc" ]
}
- if (use_seccomp_bpf) {
- defines += [ "USE_SECCOMP_BPF" ]
- } else {
+ if (!use_seccomp_bpf) {
if (is_linux) {
sources -= [
"sandbox_linux/bpf_cros_arm_gpu_policy_linux.cc",
@@ -570,9 +568,8 @@ mojom("mojo_bindings") {
"render_widget_window_tree_client_factory.mojom",
"renderer.mojom",
"service_worker/embedded_worker.mojom",
- "service_worker/embedded_worker_setup.mojom",
- "service_worker/fetch_event_dispatcher.mojom",
"service_worker/service_worker.mojom",
+ "service_worker/service_worker_event_dispatcher.mojom",
"service_worker/service_worker_types.mojom",
"storage_partition_service.mojom",
"url_loader.mojom",