PlzNavigate: Fix wrong SourceLocation.

third_party/WebKit/Source/core/loader/FrameLoader.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights
  * reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
  * (http://www.torchmobile.com/)
  * Copyright (C) 2008 Alp Toker <alp@atoker.com>
  * Copyright (C) Research In Motion Limited 2009. All rights reserved.
  * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com>
  * Copyright (C) 2011 Google Inc. All rights reserved.
@@ skipping 1248 matching lines @@
 
     if (i == target_frames.size())
       should_close = true;
   }
 
   return should_close;
 }
 
 NavigationPolicy FrameLoader::ShouldContinueForNavigationPolicy(
     const ResourceRequest& request,
+    Document* origin_document,
     const SubstituteData& substitute_data,
     DocumentLoader* loader,
     ContentSecurityPolicyDisposition
         should_check_main_world_content_security_policy,
     NavigationType type,
     NavigationPolicy policy,
     FrameLoadType frame_load_type,
     bool is_client_redirect,
     HTMLFormElement* form) {
   // Don't ask if we are loading an empty URL.
@@ skipping 15 matching lines @@
                         kCheckContentSecurityPolicy,
                     settings && settings->GetBrowserSideNavigationEnabled(),
                     ContentSecurityPolicy::CheckHeaderType::kCheckEnforce) ==
       kNavigationPolicyIgnore) {
     return kNavigationPolicyIgnore;
   }
 
   bool replaces_current_history_item =
       frame_load_type == kFrameLoadTypeReplaceCurrentItem;
   policy = Client()->DecidePolicyForNavigation(
-      request, loader, type, policy, replaces_current_history_item,
-      is_client_redirect, form,
+      request, origin_document, loader, type, policy,
+      replaces_current_history_item, is_client_redirect, form,
       should_check_main_world_content_security_policy);
   if (policy == kNavigationPolicyCurrentTab ||
       policy == kNavigationPolicyIgnore ||
       policy == kNavigationPolicyHandledByClient ||
       policy == kNavigationPolicyHandledByClientForInitialHistory) {
     return policy;
   }
 
   Client()->LoadURLExternally(request, policy, String(),
                               replaces_current_history_item);
@@ skipping 12 matching lines @@
     bool is_client_redirect,
     HTMLFormElement* form) {
   Settings* settings = frame_->GetSettings();
   // Check report-only CSP policies, which are not checked by
   // ShouldContinueForNavigationPolicy.
   MaybeCheckCSP(request, type, frame_, policy,
                 should_check_main_world_content_security_policy ==
                     kCheckContentSecurityPolicy,
                 settings && settings->GetBrowserSideNavigationEnabled(),
                 ContentSecurityPolicy::CheckHeaderType::kCheckReportOnly);
+
   return ShouldContinueForNavigationPolicy(
-      request, substitute_data, loader,
-      should_check_main_world_content_security_policy, type, policy,
-      frame_load_type, is_client_redirect, form);
+      request,
+      // |origin_document| is not set. It doesn't really matter here. It is
+      // useful for PlzNavigate (aka browser-side-navigation). It is used
+      // during the first navigation and not during redirects.
+      nullptr,  // origin_document
+      substitute_data, loader, should_check_main_world_content_security_policy,
+      type, policy, frame_load_type, is_client_redirect, form);
 }
 
 NavigationPolicy FrameLoader::CheckLoadCanStart(
     FrameLoadRequest& frame_load_request,
     FrameLoadType type,
     NavigationPolicy navigation_policy,
     NavigationType navigation_type) {
   if (frame_->GetDocument()->PageDismissalEventBeingDispatched() !=
       Document::kNoDismissal) {
     return kNavigationPolicyIgnore;
@@ skipping 13 matching lines @@
   Settings* settings = frame_->GetSettings();
   MaybeCheckCSP(
       resource_request, navigation_type, frame_, navigation_policy,
       frame_load_request.ShouldCheckMainWorldContentSecurityPolicy() ==
           kCheckContentSecurityPolicy,
       settings && settings->GetBrowserSideNavigationEnabled(),
       ContentSecurityPolicy::CheckHeaderType::kCheckReportOnly);
   ModifyRequestForCSP(resource_request, nullptr);
 
   return ShouldContinueForNavigationPolicy(
-      resource_request, frame_load_request.GetSubstituteData(), nullptr,
+      resource_request, frame_load_request.OriginDocument(),
+      frame_load_request.GetSubstituteData(), nullptr,
       frame_load_request.ShouldCheckMainWorldContentSecurityPolicy(),
       navigation_type, navigation_policy, type,
       frame_load_request.ClientRedirect() ==
           ClientRedirectPolicy::kClientRedirect,
       frame_load_request.Form());
 }
 
 void FrameLoader::StartLoad(FrameLoadRequest& frame_load_request,
                             FrameLoadType type,
                             NavigationPolicy navigation_policy,
@@ skipping 302 matching lines @@
   // TODO(japhet): This is needed because the browser process DCHECKs if the
   // first entry we commit in a new frame has replacement set. It's unclear
   // whether the DCHECK is right, investigate removing this special case.
   bool replace_current_item = load_type == kFrameLoadTypeReplaceCurrentItem &&
                               (!Opener() || !request.Url().IsEmpty());
   loader->SetReplacesCurrentHistoryItem(replace_current_item);
   return loader;
 }
 
 }  // namespace blink