Commit 4b81eeac authored by Rakina Zata Amni's avatar Rakina Zata Amni Committed by Commit Bot

Change navigation_token check in DidCommitNavigationInternal to DCHECK

navigation_token is only needed for browser-initiated same-document
navigations, which is handled in DidFinishSameDocumentNavigation.

See discussion: https://groups.google.com/a/chromium.org/g/navigation-dev/c/N_QfNAB3x44/m/ABGSPq6OAgAJ

Bug: 1131832
Change-Id: I9c5ae4eb76bc361473b4ea833eee0ed6fb1d0887
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2478744Reviewed-by: default avatarCamille Lamy <clamy@chromium.org>
Commit-Queue: Rakina Zata Amni <rakina@chromium.org>
Cr-Commit-Position: refs/heads/master@{#820228}
parent 2b2ffd95
...@@ -8454,12 +8454,9 @@ bool RenderFrameHostImpl::DidCommitNavigationInternal( ...@@ -8454,12 +8454,9 @@ bool RenderFrameHostImpl::DidCommitNavigationInternal(
bool is_same_document_navigation) { bool is_same_document_navigation) {
// Sanity-check the page transition for frame type. // Sanity-check the page transition for frame type.
DCHECK_EQ(ui::PageTransitionIsMainFrame(params->transition), !GetParent()); DCHECK_EQ(ui::PageTransitionIsMainFrame(params->transition), !GetParent());
if (navigation_request) {
// Check that the committing navigation token matches the navigation request. DCHECK_EQ(navigation_request->commit_params().navigation_token,
if (navigation_request && params->navigation_token);
navigation_request->commit_params().navigation_token !=
params->navigation_token) {
navigation_request.reset();
} }
if (!navigation_request) { if (!navigation_request) {
......
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