diff options
Diffstat (limited to 'chromium/third_party/blink/renderer/core/loader/frame_loader.cc')
-rw-r--r-- | chromium/third_party/blink/renderer/core/loader/frame_loader.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/chromium/third_party/blink/renderer/core/loader/frame_loader.cc b/chromium/third_party/blink/renderer/core/loader/frame_loader.cc index ebc44803f9a..3f2dad0e9a2 100644 --- a/chromium/third_party/blink/renderer/core/loader/frame_loader.cc +++ b/chromium/third_party/blink/renderer/core/loader/frame_loader.cc @@ -444,7 +444,7 @@ void FrameLoader::DidFinishNavigation() { // progress. DCHECK((document_loader_ && document_loader_->SentDidFinishLoad()) || !HasProvisionalNavigation()); - if (!document_loader_ || !document_loader_->SentDidFinishLoad() || + if ((document_loader_ && !document_loader_->SentDidFinishLoad()) || HasProvisionalNavigation()) { return; } @@ -730,9 +730,6 @@ bool FrameLoader::PrepareRequestForThisFrame(FrameLoadRequest& request) { "Not allowed to load local resource: " + url.ElidedString())); return false; } - - if (request.FrameName().IsEmpty()) - request.SetFrameName(frame_->GetDocument()->BaseTarget()); return true; } @@ -948,7 +945,7 @@ void FrameLoader::StartNavigation(const FrameLoadRequest& passed_request, } } - if (request.ClientRedirect() == ClientRedirectPolicy::kClientRedirect) { + if (request.ClientRedirectReason() != ClientNavigationReason::kNone) { probe::FrameRequestedNavigation(frame_, frame_, url, request.ClientRedirectReason()); } |