Plumb initiator out of Blink.

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 210 matching lines @@
   visitor->trace(m_provisionalItem);
   visitor->trace(m_deferredHistoryLoad);
 }
 
 void FrameLoader::init() {
   ResourceRequest initialRequest(KURL(ParsedURLString, emptyString));
   initialRequest.setRequestContext(WebURLRequest::RequestContextInternal);
   initialRequest.setFrameType(m_frame->isMainFrame()
                                   ? WebURLRequest::FrameTypeTopLevel
                                   : WebURLRequest::FrameTypeNested);
-  m_provisionalDocumentLoader =
-      client()->createDocumentLoader(m_frame, initialRequest, SubstituteData(),
-                                     ClientRedirectPolicy::NotClientRedirect);
+  // TODO(dcheng): Strictly speaking, this should be passing in the creator of
+  // the frame.
+  m_provisionalDocumentLoader = client()->createDocumentLoader(
+      m_frame, initialRequest, SubstituteData(),
+      ClientRedirectPolicy::NotClientRedirect, nullptr);
   m_provisionalDocumentLoader->startLoadingMainResource();
   m_frame->document()->cancelParsing();
   m_stateMachine.advanceTo(
       FrameLoaderStateMachine::DisplayingInitialEmptyDocument);
   // Suppress finish notifications for inital empty documents, since they don't
   // generate start notifications.
   if (m_documentLoader)
     m_documentLoader->setSentDidFinishLoad();
   // Self-suspend if created in an already suspended Page. Note that both
   // startLoadingMainResource() and cancelParsing() may have already detached
@@ skipping 1256 matching lines @@
     }
 
     if (i == targetFrames.size())
       shouldClose = true;
   }
 
   return shouldClose;
 }
 
 NavigationPolicy FrameLoader::shouldContinueForNavigationPolicy(
+    Document* originDocument,
     const ResourceRequest& request,
     const SubstituteData& substituteData,
     DocumentLoader* loader,
     ContentSecurityPolicyDisposition shouldCheckMainWorldContentSecurityPolicy,
     NavigationType type,
     NavigationPolicy policy,
     FrameLoadType frameLoadType,
     bool isClientRedirect,
     HTMLFormElement* form) {
   // Don't ask if we are loading an empty URL.
@@ skipping 44 matching lines @@
       // see https://crbug.com/701749
       !browserSideNavigationEnabled &&
       !m_frame->document()->contentSecurityPolicy()->allowFormAction(
           request.url(), request.redirectStatus())) {
     return NavigationPolicyIgnore;
   }
 
   bool replacesCurrentHistoryItem =
       frameLoadType == FrameLoadTypeReplaceCurrentItem;
   policy = client()->decidePolicyForNavigation(
-      request, loader, type, policy, replacesCurrentHistoryItem,
+      originDocument, request, loader, type, policy, replacesCurrentHistoryItem,
       isClientRedirect, form, shouldCheckMainWorldContentSecurityPolicy);
   if (policy == NavigationPolicyCurrentTab ||
       policy == NavigationPolicyIgnore ||
       policy == NavigationPolicyHandledByClient ||
       policy == NavigationPolicyHandledByClientForInitialHistory) {
     return policy;
   }
 
   if (!LocalDOMWindow::allowPopUp(*m_frame) &&
       !UserGestureIndicator::utilizeUserGesture())
     return NavigationPolicyIgnore;
+  // TODO(dcheng): Does this need to plumb the origin document through?
   client()->loadURLExternally(request, policy, String(),
                               replacesCurrentHistoryItem);
   return NavigationPolicyIgnore;
 }
 
 NavigationPolicy FrameLoader::checkLoadCanStart(
     FrameLoadRequest& frameLoadRequest,
     FrameLoadType type,
     NavigationPolicy navigationPolicy,
     NavigationType navigationType) {
   if (m_frame->document()->pageDismissalEventBeingDispatched() !=
       Document::NoDismissal) {
     return NavigationPolicyIgnore;
   }
 
   // Record the latest requiredCSP value that will be used when sending this
   // request.
   ResourceRequest& resourceRequest = frameLoadRequest.resourceRequest();
   recordLatestRequiredCSP();
   modifyRequestForCSP(resourceRequest, nullptr);
 
   return shouldContinueForNavigationPolicy(
-      resourceRequest, frameLoadRequest.substituteData(), nullptr,
+      frameLoadRequest.originDocument(), resourceRequest,
+      frameLoadRequest.substituteData(), nullptr,
       frameLoadRequest.shouldCheckMainWorldContentSecurityPolicy(),
       navigationType, navigationPolicy, type,
       frameLoadRequest.clientRedirect() == ClientRedirectPolicy::ClientRedirect,
       frameLoadRequest.form());
 }
 
 void FrameLoader::startLoad(FrameLoadRequest& frameLoadRequest,
                             FrameLoadType type,
                             NavigationPolicy navigationPolicy) {
   DCHECK(client()->hasWebView());
@@ skipping 268 matching lines @@
   TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID("loading", "FrameLoader", this,
                                       toTracedValue());
 }
 
 DocumentLoader* FrameLoader::createDocumentLoader(
     const ResourceRequest& request,
     const FrameLoadRequest& frameLoadRequest,
     FrameLoadType loadType,
     NavigationType navigationType) {
   DocumentLoader* loader = client()->createDocumentLoader(
-      m_frame, request, frameLoadRequest.substituteData().isValid()
-                            ? frameLoadRequest.substituteData()
-                            : defaultSubstituteDataForURL(request.url()),
-      frameLoadRequest.clientRedirect());
+      m_frame, request,
+      frameLoadRequest.substituteData().isValid()
+          ? frameLoadRequest.substituteData()
+          : defaultSubstituteDataForURL(request.url()),
+      frameLoadRequest.clientRedirect(), frameLoadRequest.originDocument());
 
   loader->setLoadType(loadType);
   loader->setNavigationType(navigationType);
   loader->setReplacesCurrentHistoryItem(loadType ==
                                         FrameLoadTypeReplaceCurrentItem);
   return loader;
 }
 
 }  // namespace blink