Commit 7ecd465c authored by Dmitry Gozman's avatar Dmitry Gozman Committed by Commit Bot

DocumentLoader: remove CancelClientNavigaiton call

This call does supposedly cancel client navigation, while in reality
it does not, since there is no client navigation happening just yet.
See fragment-change-does-not-cancel-pending-navigation.html which
exhibits this behavior.

Bug: none
Change-Id: If474156d4e2ebddc8c2129bd2173aa1713345ea2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1805248
Commit-Queue: Dmitry Gozman <dgozman@chromium.org>
Reviewed-by: default avatarNate Chapin <japhet@chromium.org>
Cr-Commit-Position: refs/heads/master@{#696930}
parent 77f40266
...@@ -978,12 +978,9 @@ void DocumentLoader::CommitSameDocumentNavigationInternal( ...@@ -978,12 +978,9 @@ void DocumentLoader::CommitSameDocumentNavigationInternal(
// If we have a provisional request for a different document, a fragment // If we have a provisional request for a different document, a fragment
// scroll should cancel it. // scroll should cancel it.
// Note: see fragment-change-does-not-cancel-pending-navigation, where
// this does not actually happen.
GetFrameLoader().DetachProvisionalDocumentLoader(); GetFrameLoader().DetachProvisionalDocumentLoader();
// TODO(dgozman): despite the comment above, next call does not actually
// cancel client navigation. See
// fragment-change-does-not-cancel-pending-navigation test. We should remove
// this call.
GetFrameLoader().CancelClientNavigation();
GetFrameLoader().DidFinishNavigation( GetFrameLoader().DidFinishNavigation(
FrameLoader::NavigationFinishState::kSuccess); FrameLoader::NavigationFinishState::kSuccess);
......
...@@ -36,6 +36,8 @@ ...@@ -36,6 +36,8 @@
} }
function iframeOnLoad() { function iframeOnLoad() {
w3Iframe.onload = undefined;
bodyElement.appendChild(acronymElement); bodyElement.appendChild(acronymElement);
acronymElement.offsetWidth; acronymElement.offsetWidth;
......
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