diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-06 12:48:11 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:33:43 +0000 |
commit | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (patch) | |
tree | fa14ba0ca8d2683ba2efdabd246dc9b18a1229c6 /chromium/content/common/BUILD.gn | |
parent | 79b4f909db1049fca459c07cca55af56a9b54fe3 (diff) | |
download | qtwebengine-chromium-7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3.tar.gz |
BASELINE: Update Chromium to 84.0.4147.141
Change-Id: Ib85eb4cfa1cbe2b2b81e5022c8cad5c493969535
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/content/common/BUILD.gn')
-rw-r--r-- | chromium/content/common/BUILD.gn | 103 |
1 files changed, 15 insertions, 88 deletions
diff --git a/chromium/content/common/BUILD.gn b/chromium/content/common/BUILD.gn index f22f6c8410d..cdce63391b1 100644 --- a/chromium/content/common/BUILD.gn +++ b/chromium/content/common/BUILD.gn @@ -55,6 +55,8 @@ source_set("common") { "appcache_interfaces.h", "ax_content_node_data.cc", "ax_content_node_data.h", + "ax_serialization_utils.cc", + "ax_serialization_utils.h", "background_fetch/background_fetch_types.cc", "background_fetch/background_fetch_types.h", "browser_plugin/browser_plugin_constants.cc", @@ -92,7 +94,6 @@ source_set("common") { "drag_event_source_info.h", "drag_messages.h", "drag_traits.h", - "edit_command.h", "fetch/fetch_api_request_proto.cc", "fetch/fetch_api_request_proto.h", "fetch/fetch_request_type_converters.cc", @@ -123,16 +124,12 @@ source_set("common") { "input/ime_text_span_conversions.h", "input/input_event.cc", "input/input_event.h", - "input/input_event_ack.cc", - "input/input_event_ack.h", "input/input_event_ack_state.cc", "input/input_event_dispatch_type.h", "input/input_event_mojom_traits.cc", "input/input_event_mojom_traits.h", "input/input_event_stream_validator.cc", "input/input_event_stream_validator.h", - "input/sync_compositor_messages.cc", - "input/sync_compositor_messages.h", "input/synthetic_gesture_params.cc", "input/synthetic_gesture_params.h", "input/synthetic_pinch_gesture_params.cc", @@ -149,8 +146,6 @@ source_set("common") { "input/synthetic_tap_gesture_params.h", "input/synthetic_web_input_event_builders.cc", "input/synthetic_web_input_event_builders.h", - "input/touch_action_optional_mojom_traits.cc", - "input/touch_action_optional_mojom_traits.h", "input/touch_event_stream_validator.cc", "input/touch_event_stream_validator.h", "input/web_mouse_wheel_event_traits.cc", @@ -234,8 +229,9 @@ source_set("common") { "//third_party/blink/public:blink_headers", "//third_party/blink/public/common", "//ui/accessibility", + "//ui/accessibility/mojom", "//ui/base/cursor", - "//ui/base/mojom:cursor_type", + "//ui/base/cursor/mojom:cursor_type", "//ui/events/ipc", ] deps = [ @@ -363,6 +359,8 @@ source_set("common") { if (!use_aura || !use_x11) { sources -= [ "cursors/webcursor_aurax11.cc" ] + } else { + deps += [ "//ui/gfx/x" ] } if (is_linux) { @@ -411,10 +409,7 @@ source_set("common") { } if (use_clang_profiling_inside_sandbox) { - sources += [ - "profiling_utils.cc", - "profiling_utils.h", - ] + sources += [ "profiling_utils.cc" ] } } @@ -444,6 +439,7 @@ mojom("mojo_bindings") { "ax_content_tree_update.mojom", "child_process.mojom", "document_scoped_interface_bundle.mojom", + "dom_automation_controller.mojom", "download/mhtml_file_writer.mojom", "field_trial_recorder.mojom", "frame.mojom", @@ -549,85 +545,23 @@ mojom("mojo_bindings") { { types = [ { - mojom = "content.mojom.SyncCompositorDemandDrawHwParams" - cpp = "::content::SyncCompositorDemandDrawHwParams" - }, - { - mojom = "content.mojom.SyncCompositorSetSharedMemoryParams" - cpp = "::content::SyncCompositorSetSharedMemoryParams" - }, - { - mojom = "content.mojom.SyncCompositorDemandDrawSwParams" - cpp = "::content::SyncCompositorDemandDrawSwParams" - }, - { - mojom = "content.mojom.SyncCompositorCommonRendererParams" - cpp = "::content::SyncCompositorCommonRendererParams" - }, - ] - traits_headers = [ "//content/common/input/sync_compositor_messages.h" ] - traits_public_deps = [ "//ui/gfx/ipc" ] - }, - { - types = [ - { - mojom = "content.mojom.Button" - cpp = "::blink::WebPointerProperties::Button" - }, - { - mojom = "content.mojom.Cancelability" - cpp = "::blink::WebInputEvent::DispatchType" - }, - { mojom = "content.mojom.ContentSecurityPolicy" cpp = "::content::ContentSecurityPolicy" }, { - mojom = "content.mojom.DidOverscrollParams" - cpp = "::ui::DidOverscrollParams" - }, - { - mojom = "content.mojom.EditCommand" - cpp = "::content::EditCommand" - }, - { mojom = "content.mojom.Event" cpp = "::std::unique_ptr<::content::InputEvent>" move_only = true }, { - mojom = "content.mojom.EventType" - cpp = "::blink::WebInputEvent::Type" - }, - { mojom = "content.mojom.FrameReplicationState" cpp = "::content::FrameReplicationState" }, { - mojom = "content.mojom.GestureDevice" - cpp = "::blink::WebGestureDevice" - }, - { - mojom = "content.mojom.InertialPhaseState" - cpp = "::blink::WebGestureEvent::InertialPhaseState" - }, - { - mojom = "content.mojom.InputEventAckSource" - cpp = "::content::InputEventAckSource" - }, - { - mojom = "content.mojom.InputEventAckState" - cpp = "::content::InputEventAckState" - }, - { mojom = "content.mojom.NetworkConnectionType" cpp = "::net::NetworkChangeNotifier::ConnectionType" }, { - mojom = "content.mojom.PointerType" - cpp = "::blink::WebPointerProperties::PointerType" - }, - { mojom = "content.mojom.ScrollGranularity" cpp = "::ui::ScrollGranularity" }, @@ -656,14 +590,6 @@ mojom("mojo_bindings") { cpp = "::ui::NativeTheme::SystemThemeColor" }, { - mojom = "content.mojom.TouchActionOptional" - cpp = "::cc::TouchAction" - }, - { - mojom = "content.mojom.TouchState" - cpp = "::blink::WebTouchPoint::State" - }, - { mojom = "content.mojom.VisualProperties" cpp = "::content::VisualProperties" }, @@ -680,7 +606,6 @@ mojom("mojo_bindings") { traits_headers = [ "//cc/input/touch_action.h", "//content/common/cursors/webcursor.h", - "//content/common/edit_command.h", "//content/common/frame_replication_state.h", "//content/common/input/input_event.h", "//content/common/input/synthetic_pinch_gesture_params.h", @@ -689,12 +614,8 @@ mojom("mojo_bindings") { "//content/common/input/synthetic_smooth_scroll_gesture_params.h", "//content/common/input/synthetic_tap_gesture_params.h", "//content/common/visual_properties.h", - "//content/public/common/input_event_ack_source.h", - "//content/public/common/input_event_ack_state.h", "//content/public/common/web_preferences.h", "//net/base/network_change_notifier.h", - "//third_party/blink/public/common/input/web_gesture_device.h", - "//third_party/blink/public/common/input/web_gesture_event.h", "//third_party/blink/public/common/input/web_input_event.h", "//third_party/blink/public/common/input/web_mouse_wheel_event.h", "//third_party/blink/public/common/input/web_pointer_properties.h", @@ -708,7 +629,6 @@ mojom("mojo_bindings") { traits_private_headers = [ "//content/common/frame_messages.h", "//content/common/input/input_event_mojom_traits.h", - "//content/common/input/touch_action_optional_mojom_traits.h", "//content/common/input_messages.h", "//content/common/view_messages.h", "//content/common/widget_messages.h", @@ -731,6 +651,7 @@ mojom("mojo_bindings") { "//services/network/public/cpp", "//third_party/blink/public/common", "//ui/accessibility", + "//ui/base/cursor", "//ui/base/ime:text_input_types", "//ui/events/blink", "//ui/gfx/ipc", @@ -743,6 +664,10 @@ mojom("mojo_bindings") { { types = [ { + mojom = "content.mojom.Impression" + cpp = "::content::Impression" + }, + { mojom = "content.mojom.MixedContentContextType" cpp = "::blink::WebMixedContentContextType" }, @@ -766,6 +691,7 @@ mojom("mojo_bindings") { traits_headers = [ "//content/common/content_param_traits.h", "//content/common/navigation_params.h", + "//content/public/common/impression.h", "//content/public/common/navigation_policy.h", "//content/public/common/page_state.h", "//third_party/blink/public/platform/web_mixed_content_context_type.h", @@ -812,6 +738,7 @@ mojom("mojo_bindings") { "//skia/public/mojom", "//third_party/blink/public/mojom:mojom_core", "//third_party/blink/public/mojom:web_feature_mojo_bindings", + "//ui/accessibility:ax_enums_mojo", "//ui/accessibility/mojom", "//ui/base/ime/mojom", "//ui/base/mojom", |