Commit 09fb9ba1 authored by Antonio Sartori's avatar Antonio Sartori Committed by Commit Bot

Remove no-op if from RFHImpl::DidCommitNavigation

RenderFrameHostImpl::DidCommitNavigation is called either by
(1) DidCommitPerNavigationMojoInterfaceNavigation or (2)
DidCommitProvisionalLoad.

(1) always passes a committing_navigation_request (there is a CHECK
just before calling DidCommitNavigation that the navigation has been
found in the map navigation_requests_).

(2) moves into committing_navigation_request the navigation_request_ of
the RFH, hence making navigation_request_ null.

Hence this if statement is a no-op and can be eliminated.

Change-Id: Iae99e84c4d127c679001598ead84a061a16cf515
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2426615
Commit-Queue: Antonio Sartori <antoniosartori@chromium.org>
Reviewed-by: default avatarArthur Sonzogni <arthursonzogni@chromium.org>
Cr-Commit-Position: refs/heads/master@{#810124}
parent 388ba2b3
......@@ -8765,7 +8765,7 @@ void RenderFrameHostImpl::SendCommitFailedNavigation(
// Called when the renderer navigates. For every frame loaded, we'll get this
// notification containing parameters identifying the navigation.
void RenderFrameHostImpl::DidCommitNavigation(
std::unique_ptr<NavigationRequest> committing_navigation_request,
std::unique_ptr<NavigationRequest> request,
std::unique_ptr<FrameHostMsg_DidCommitProvisionalLoad_Params> params,
mojom::DidCommitProvisionalLoadInterfaceParamsPtr interface_params) {
// BackForwardCacheImpl::CanStoreRenderFrameHost prevents placing the pages
......@@ -8777,13 +8777,6 @@ void RenderFrameHostImpl::DidCommitNavigation(
// kInBackForwardCache state.
DCHECK(!IsInBackForwardCache());
NavigationRequest* request;
if (committing_navigation_request) {
request = committing_navigation_request.get();
} else {
request = navigation_request();
}
if (request && request->IsNavigationStarted()) {
main_frame_request_ids_ = {params->request_id,
request->GetGlobalRequestID()};
......@@ -8876,8 +8869,7 @@ void RenderFrameHostImpl::DidCommitNavigation(
// therefore the global object is not replaced.
}
if (!DidCommitNavigationInternal(std::move(committing_navigation_request),
std::move(params),
if (!DidCommitNavigationInternal(std::move(request), std::move(params),
false /* is_same_document_navigation */)) {
return;
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment