diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-05-24 11:40:17 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-05-24 12:42:11 +0000 |
commit | 5d87695f37678f96492b258bbab36486c59866b4 (patch) | |
tree | be9783bbaf04fb930c4d74ca9c00b5e7954c8bc6 /chromium/content/common/frame_messages.h | |
parent | 6c11fb357ec39bf087b8b632e2b1e375aef1b38b (diff) | |
download | qtwebengine-chromium-5d87695f37678f96492b258bbab36486c59866b4.tar.gz |
BASELINE: Update Chromium to 75.0.3770.56
Change-Id: I86d2007fd27a45d5797eee06f4c9369b8b50ac4f
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/content/common/frame_messages.h')
-rw-r--r-- | chromium/content/common/frame_messages.h | 101 |
1 files changed, 31 insertions, 70 deletions
diff --git a/chromium/content/common/frame_messages.h b/chromium/content/common/frame_messages.h index b6800bd3dab..8673d65844e 100644 --- a/chromium/content/common/frame_messages.h +++ b/chromium/content/common/frame_messages.h @@ -26,7 +26,6 @@ #include "content/common/content_param_traits.h" #include "content/common/content_security_policy/csp_context.h" #include "content/common/content_security_policy_header.h" -#include "content/common/download/mhtml_save_status.h" #include "content/common/frame_message_enums.h" #include "content/common/frame_message_structs.h" #include "content/common/frame_owner_properties.h" @@ -37,7 +36,6 @@ #include "content/common/resource_timing_info.h" #include "content/common/savable_subframe.h" #include "content/public/common/common_param_traits.h" -#include "content/public/common/console_message_level.h" #include "content/public/common/context_menu_params.h" #include "content/public/common/favicon_url.h" #include "content/public/common/frame_navigate_params.h" @@ -62,6 +60,7 @@ #include "third_party/blink/public/common/messaging/message_port_channel.h" #include "third_party/blink/public/common/messaging/transferable_message.h" #include "third_party/blink/public/mojom/choosers/file_chooser.mojom.h" +#include "third_party/blink/public/mojom/devtools/console_message.mojom.h" #include "third_party/blink/public/mojom/fetch/fetch_api_request.mojom.h" #include "third_party/blink/public/mojom/frame/lifecycle.mojom.h" #include "third_party/blink/public/platform/web_focus_type.h" @@ -151,16 +150,18 @@ IPC_ENUM_TRAITS_MIN_MAX_VALUE(blink::WebScrollDirection, IPC_ENUM_TRAITS_MIN_MAX_VALUE(blink::WebScrollGranularity, blink::kFirstScrollGranularity, blink::kLastScrollGranularity) -IPC_ENUM_TRAITS_MIN_MAX_VALUE(content::NavigationDownloadPolicy, - content::NavigationDownloadPolicy::kAllow, - content::NavigationDownloadPolicy::kMaxValue) IPC_ENUM_TRAITS_MAX_VALUE(blink::mojom::FeaturePolicyDisposition, blink::mojom::FeaturePolicyDisposition::kMaxValue) IPC_ENUM_TRAITS_MAX_VALUE(blink::mojom::FrameVisibility, blink::mojom::FrameVisibility::kMaxValue) IPC_ENUM_TRAITS_MIN_MAX_VALUE(blink::FrameOcclusionState, - blink::kUnknownOcclusionState, - blink::kMaxOcclusionState) + blink::FrameOcclusionState::kUnknown, + blink::FrameOcclusionState::kMaxValue) + +IPC_STRUCT_TRAITS_BEGIN(content::NavigationDownloadPolicy) + IPC_STRUCT_TRAITS_MEMBER(observed_types) + IPC_STRUCT_TRAITS_MEMBER(disallowed_types) +IPC_STRUCT_TRAITS_END() IPC_STRUCT_TRAITS_BEGIN(blink::WebFloatSize) IPC_STRUCT_TRAITS_MEMBER(width) @@ -264,6 +265,7 @@ IPC_STRUCT_TRAITS_BEGIN(content::FrameVisualProperties) IPC_STRUCT_TRAITS_MEMBER(capture_sequence_number) IPC_STRUCT_TRAITS_MEMBER(zoom_level) IPC_STRUCT_TRAITS_MEMBER(page_scale_factor) + IPC_STRUCT_TRAITS_MEMBER(is_pinch_gesture_active) IPC_STRUCT_TRAITS_MEMBER(local_surface_id_allocation) IPC_STRUCT_TRAITS_END() @@ -281,6 +283,7 @@ IPC_STRUCT_TRAITS_END() IPC_STRUCT_TRAITS_BEGIN(blink::FramePolicy) IPC_STRUCT_TRAITS_MEMBER(sandbox_flags) IPC_STRUCT_TRAITS_MEMBER(container_policy) + IPC_STRUCT_TRAITS_MEMBER(allowed_to_download_without_user_activation) IPC_STRUCT_TRAITS_END() IPC_STRUCT_TRAITS_BEGIN(content::PageImportanceSignals) @@ -438,6 +441,10 @@ IPC_STRUCT_BEGIN_WITH_PARENT(FrameHostMsg_DidCommitProvisionalLoad_Params, // Request ID generated by the renderer. IPC_STRUCT_MEMBER(int, request_id) + + // A token that has been passed by the browser process when it asked the + // renderer process to commit the navigation. + IPC_STRUCT_MEMBER(base::UnguessableToken, navigation_token) IPC_STRUCT_END() IPC_STRUCT_BEGIN(FrameMsg_PostMessage_Params) @@ -521,9 +528,9 @@ IPC_STRUCT_TRAITS_BEGIN(content::CommitNavigationParams) IPC_STRUCT_TRAITS_MEMBER(is_view_source) IPC_STRUCT_TRAITS_MEMBER(should_clear_history_list) IPC_STRUCT_TRAITS_MEMBER(navigation_timing) - IPC_STRUCT_TRAITS_MEMBER(service_worker_provider_id) IPC_STRUCT_TRAITS_MEMBER(appcache_host_id) IPC_STRUCT_TRAITS_MEMBER(was_activated) + IPC_STRUCT_TRAITS_MEMBER(navigation_token) #if defined(OS_ANDROID) IPC_STRUCT_TRAITS_MEMBER(data_url_as_string) #endif @@ -617,40 +624,6 @@ IPC_STRUCT_TRAITS_BEGIN(content::SavableSubframe) IPC_STRUCT_TRAITS_MEMBER(routing_id) IPC_STRUCT_TRAITS_END() -IPC_STRUCT_BEGIN(FrameMsg_SerializeAsMHTML_Params) - // Job id - used to match responses to requests. - IPC_STRUCT_MEMBER(int, job_id) - - // Destination file handle. - IPC_STRUCT_MEMBER(IPC::PlatformFileForTransit, destination_file) - - // MHTML boundary marker / MIME multipart boundary maker. The same - // |mhtml_boundary_marker| should be used for serialization of each frame. - IPC_STRUCT_MEMBER(std::string, mhtml_boundary_marker) - - // Whether to use binary encoding while serializing. Binary encoding is not - // supported outside of Chrome, so this should not be used if the MHTML is - // intended for sharing. - IPC_STRUCT_MEMBER(bool, mhtml_binary_encoding) - - // Whether to remove popup overlay while serializing. - IPC_STRUCT_MEMBER(bool, mhtml_popup_overlay_removal) - - // Whether to detect problems while serializing. - IPC_STRUCT_MEMBER(bool, mhtml_problem_detection) - - // |digests_of_uris_to_skip| contains digests of uris of MHTML parts that - // should be skipped. This helps deduplicate mhtml parts across frames. - // SECURITY NOTE: Sha256 digests (rather than uris) are used to prevent - // disclosing uris to other renderer processes; the digests should be - // generated using SHA256HashString function from crypto/sha2.h and hashing - // |salt + url.spec()|. - IPC_STRUCT_MEMBER(std::set<std::string>, digests_of_uris_to_skip) - - // Salt used for |digests_of_uris_to_skip|. - IPC_STRUCT_MEMBER(std::string, salt) -IPC_STRUCT_END() - // This message is used to send hittesting data from the renderer in order // to perform hittesting on the browser process. IPC_STRUCT_BEGIN(FrameHostMsg_HittestData_Params) @@ -871,7 +844,7 @@ IPC_MESSAGE_ROUTED0(FrameMsg_DidStopLoading) // Add message to the frame console. IPC_MESSAGE_ROUTED2(FrameMsg_AddMessageToConsole, - content::ConsoleMessageLevel /* level */, + blink::mojom::ConsoleMessageLevel /* level */, std::string /* message */) // Tells the renderer to reload the frame, optionally bypassing the cache while @@ -969,9 +942,6 @@ IPC_MESSAGE_ROUTED1(FrameMsg_SetTextTrackSettings, // frame can update its loading state. IPC_MESSAGE_ROUTED0(FrameMsg_CheckCompleted) -// Posts a message from a frame in another process to the current renderer. -IPC_MESSAGE_ROUTED1(FrameMsg_PostMessageEvent, FrameMsg_PostMessage_Params) - // Tells the RenderFrame to clear the focused element (if any). IPC_MESSAGE_ROUTED0(FrameMsg_ClearFocusedElement) @@ -1013,16 +983,10 @@ IPC_MESSAGE_ROUTED0(FrameMsg_GetSavableResourceLinks) // Get html data by serializing the target frame and replacing all resource // links with a path to the local copy passed in the message payload. -IPC_MESSAGE_ROUTED2(FrameMsg_GetSerializedHtmlWithLocalLinks, +IPC_MESSAGE_ROUTED3(FrameMsg_GetSerializedHtmlWithLocalLinks, FrameMsg_GetSerializedHtmlWithLocalLinks_UrlMap, - FrameMsg_GetSerializedHtmlWithLocalLinks_FrameRoutingIdMap) - -// Serialize target frame and its resources into MHTML and write it into the -// provided destination file handle. Note that when serializing multiple -// frames, one needs to serialize the *main* frame first (the main frame -// needs to go first according to RFC2557 + the main frame will trigger -// generation of the MHTML header). -IPC_MESSAGE_ROUTED1(FrameMsg_SerializeAsMHTML, FrameMsg_SerializeAsMHTML_Params) + FrameMsg_GetSerializedHtmlWithLocalLinks_FrameRoutingIdMap, + bool /* save_with_empty_url */) IPC_MESSAGE_ROUTED1(FrameMsg_SetFrameOwnerProperties, content::FrameOwnerProperties /* frame_owner_properties */) @@ -1216,12 +1180,6 @@ IPC_MESSAGE_CONTROL3(FrameHostMsg_SaveImageFromDataURL, int /* render_frame_id */, std::string /* data_url */) -// Sent when after the onload handler has been invoked for the document -// in this frame. Sent for top-level frames. |report_type| and |ui_timestamp| -// are used to report navigation metrics starting on the ui input event that -// triggered the navigation timestamp. -IPC_MESSAGE_ROUTED0(FrameHostMsg_DocumentOnLoadCompleted) - // Notifies that the initial empty document of a view has been accessed. // After this, it is no longer safe to show a pending navigation's URL without // making a URL spoof possible. @@ -1477,6 +1435,10 @@ IPC_MESSAGE_ROUTED2(FrameHostMsg_UpdateRenderThrottlingStatus, IPC_MESSAGE_ROUTED1(FrameHostMsg_UpdateUserActivationState, blink::UserActivationUpdateType /* type of state update */) +// Transfers user activation state from the source frame to the current frame. +IPC_MESSAGE_ROUTED1(FrameMsg_TransferUserActivationFrom, + int /* source_routing_id */) + // Indicates that this frame received a user gesture on a previous navigation on // the same eTLD+1. This ensures the state is propagated to any remote frames. IPC_MESSAGE_ROUTED1(FrameHostMsg_SetHasReceivedUserGestureBeforeNavigation, @@ -1515,7 +1477,7 @@ IPC_SYNC_MESSAGE_ROUTED1_2(FrameHostMsg_RunBeforeUnloadConfirm, // Notify browser the theme color has been changed. IPC_MESSAGE_ROUTED1(FrameHostMsg_DidChangeThemeColor, - SkColor /* theme_color */) + base::Optional<SkColor> /* theme_color */) // Response for FrameMsg_TextSurroundingSelectionRequest, |startOffset| and // |endOffset| are the offsets of the selection in the returned |content|. @@ -1629,14 +1591,6 @@ IPC_MESSAGE_ROUTED2(FrameHostMsg_SerializedHtmlWithLocalLinksResponse, std::string /* data buffer */, bool /* end of data? */) -// Response to FrameMsg_SerializeAsMHTML. -IPC_MESSAGE_ROUTED4( - FrameHostMsg_SerializeAsMHTMLResponse, - int /* job_id (used to match responses to requests) */, - content::MhtmlSaveStatus /* final success/failure status */, - std::set<std::string> /* digests of uris of serialized resources */, - base::TimeDelta /* how much time of the main render thread was used */) - // Sent when the renderer updates hint for importance of a tab. IPC_MESSAGE_ROUTED1(FrameHostMsg_UpdatePageImportanceSignals, content::PageImportanceSignals) @@ -1695,6 +1649,13 @@ IPC_MESSAGE_ROUTED2(FrameHostMsg_PrintCrossProcessSubframe, // should render fallback content. IPC_MESSAGE_ROUTED0(FrameHostMsg_RenderFallbackContentInParentProcess) +// Used to go to the session history entry at the given offset (ie, -1 will +// return the "back" item). This message affects a view and not just a frame, +// but is sent on the frame channel for attribution purposes. +IPC_MESSAGE_ROUTED2(FrameHostMsg_GoToEntryAtOffset, + int /* offset (from current) of history item to get */, + bool /* has_user_gesture */) + #if BUILDFLAG(USE_EXTERNAL_POPUP_MENU) // Message to show/hide a popup menu using native controls. |