Reland "Convert content::CommitNavigationParams to mojom."
This is a reland of f9763b52230da0420d0bcf051d643b45e6fd6dd0
Original change's description:
> Convert content::CommitNavigationParams to mojom.
>
> Bug: 984550
> Change-Id: Ic966c764e7fb52a9fb8d2ea44d9777bd8c1e4011
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1725096
> Reviewed-by: Avi Drissman <[email protected]>
> Reviewed-by: Scott Graham <[email protected]>
> Reviewed-by: Nasko Oskov <[email protected]>
> Commit-Queue: Lucas Gadani <[email protected]>
> Cr-Commit-Position: refs/heads/master@{#682795}
Tbr: [email protected]
Bug: 984550
Change-Id: I3ec99e6c57e33cd85203125c250a26b4e50384a7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1729921
Reviewed-by: Lucas Gadani <[email protected]>
Commit-Queue: Lucas Gadani <[email protected]>
Cr-Commit-Position: refs/heads/master@{#682950}
diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h
index f78f012..dcf012ae 100644
--- a/content/renderer/render_frame_impl.h
+++ b/content/renderer/render_frame_impl.h
@@ -37,6 +37,7 @@
#include "content/common/frame_delete_intention.h"
#include "content/common/host_zoom.mojom.h"
#include "content/common/media/renderer_audio_input_stream_factory.mojom.h"
+#include "content/common/navigation_params.mojom.h"
#include "content/common/renderer.mojom.h"
#include "content/common/unique_name_helper.h"
#include "content/common/widget.mojom.h"
@@ -172,7 +173,6 @@
struct CustomContextMenuContext;
struct FrameOwnerProperties;
struct FrameReplicationState;
-struct CommitNavigationParams;
struct ScreenInfo;
class CONTENT_EXPORT RenderFrameImpl
@@ -560,8 +560,8 @@
// mojom::FrameNavigationControl implementation:
void CommitNavigation(
- const mojom::CommonNavigationParamsPtr common_params,
- const CommitNavigationParams& commit_params,
+ mojom::CommonNavigationParamsPtr common_params,
+ mojom::CommitNavigationParamsPtr commit_params,
const network::ResourceResponseHead& response_head,
mojo::ScopedDataPipeConsumerHandle response_body,
network::mojom::URLLoaderClientEndpointsPtr url_loader_client_endpoints,
@@ -583,7 +583,7 @@
// the one from NavigationClient mojo interface.
void CommitPerNavigationMojoInterfaceNavigation(
mojom::CommonNavigationParamsPtr common_params,
- const CommitNavigationParams& commit_params,
+ mojom::CommitNavigationParamsPtr commit_params,
const network::ResourceResponseHead& response_head,
mojo::ScopedDataPipeConsumerHandle response_body,
network::mojom::URLLoaderClientEndpointsPtr url_loader_client_endpoints,
@@ -602,7 +602,7 @@
void CommitFailedNavigation(
mojom::CommonNavigationParamsPtr common_params,
- const CommitNavigationParams& commit_params,
+ mojom::CommitNavigationParamsPtr commit_params,
bool has_stale_copy_in_cache,
int error_code,
const base::Optional<std::string>& error_page_content,
@@ -615,7 +615,7 @@
// the one from NavigationClient mojo interface.
void CommitFailedPerNavigationMojoInterfaceNavigation(
mojom::CommonNavigationParamsPtr common_params,
- const CommitNavigationParams& commit_params,
+ mojom::CommitNavigationParamsPtr commit_params,
bool has_stale_copy_in_cache,
int error_code,
const base::Optional<std::string>& error_page_content,
@@ -626,7 +626,7 @@
void CommitSameDocumentNavigation(
mojom::CommonNavigationParamsPtr common_params,
- const CommitNavigationParams& commit_params,
+ mojom::CommitNavigationParamsPtr commit_params,
CommitSameDocumentNavigationCallback callback) override;
void HandleRendererDebugURL(const GURL& url) override;
void UpdateSubresourceLoaderFactories(
@@ -1251,7 +1251,7 @@
// Does preparation for the navigation to |url|.
void PrepareRenderViewForNavigation(
const GURL& url,
- const CommitNavigationParams& commit_params);
+ const mojom::CommitNavigationParams& commit_params);
// Sends a FrameHostMsg_BeginNavigation to the browser
void BeginNavigationInternal(std::unique_ptr<blink::WebNavigationInfo> info,
@@ -1269,7 +1269,7 @@
// Commit navigation with |navigation_params| prepared.
void CommitNavigationWithParams(
mojom::CommonNavigationParamsPtr common_params,
- const CommitNavigationParams& commit_params,
+ mojom::CommitNavigationParamsPtr commit_params,
std::unique_ptr<blink::URLLoaderFactoryBundleInfo>
subresource_loader_factories,
base::Optional<std::vector<mojom::TransferrableURLLoaderPtr>>
@@ -1286,11 +1286,11 @@
// in the renderer, but browser was not aware yet at the moment of issuing
// a CommitNavigation call.
bool ShouldIgnoreCommitNavigation(
- const CommitNavigationParams& commit_params);
+ const mojom::CommitNavigationParams& commit_params);
// Decodes a data url for navigation commit.
void DecodeDataURL(const mojom::CommonNavigationParams& common_params,
- const CommitNavigationParams& commit_params,
+ const mojom::CommitNavigationParams& commit_params,
std::string* mime_type,
std::string* charset,
std::string* data,
@@ -1397,8 +1397,9 @@
blink::WebLocalFrameClient::AppCacheType GetAppCacheType() override;
// Updates the state of this frame when asked to commit a navigation.
- void PrepareFrameForCommit(const GURL& url,
- const CommitNavigationParams& commit_params);
+ void PrepareFrameForCommit(
+ const GURL& url,
+ const mojom::CommitNavigationParams& commit_params);
// Updates the state when asked to commit a history navigation. Sets
// |item_for_history_navigation| and |load_type| to the appropriate values for
@@ -1426,7 +1427,7 @@
// so that it can be performed in cross-document fashion.
blink::mojom::CommitResult PrepareForHistoryNavigationCommit(
const mojom::CommonNavigationParams& common_params,
- const CommitNavigationParams& commit_params,
+ const mojom::CommitNavigationParams& commit_params,
blink::WebHistoryItem* item_for_history_navigation,
blink::WebFrameLoadType* load_type);
@@ -1445,7 +1446,7 @@
// Commit*PerNavigationMojoInterfaceNavigation functions.
void CommitNavigationInternal(
mojom::CommonNavigationParamsPtr common_params,
- const CommitNavigationParams& commit_params,
+ mojom::CommitNavigationParamsPtr commit_params,
const network::ResourceResponseHead& response_head,
mojo::ScopedDataPipeConsumerHandle response_body,
network::mojom::URLLoaderClientEndpointsPtr url_loader_client_endpoints,
@@ -1465,7 +1466,7 @@
void CommitFailedNavigationInternal(
mojom::CommonNavigationParamsPtr common_params,
- const CommitNavigationParams& commit_params,
+ mojom::CommitNavigationParamsPtr commit_params,
bool has_stale_copy_in_cache,
int error_code,
const base::Optional<std::string>& error_page_content,
@@ -1562,7 +1563,7 @@
// is never used after the initial navigation.
// TODO(creis): Expand this to include any corresponding same-process
// PageStates for the whole subtree in https://crbug.com/639842.
- std::map<std::string, bool> history_subframe_unique_names_;
+ base::flat_map<std::string, bool> history_subframe_unique_names_;
// Stores the current history item for this frame, so that updates to it can
// be reported to the browser process via SendUpdateState.
