Make DocumentInit take a DocumentLoader instead of a LocalFrame

This better communicates the responsible party for security checks.
You can definitely know which LocalFrame is associated with a
DocumentLoader, but a LocalFrame may be associated with multiple
DocumentLoaders.

Also, remove some dead code and inline a couple of methods.

Change-Id: I563a4259981bd61fd5a19b154cdd59f2aed46d24
Reviewed-on: https://chromium-review.googlesource.com/1159604
Commit-Queue: Nate Chapin <japhet@chromium.org>
Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Cr-Commit-Position: refs/heads/master@{#580972}

third_party/blink/renderer/core/dom/document_init.cc

@@ -40,10 +40,11 @@
 namespace blink {
 
 // FIXME: Broken with OOPI.
-static Document* ParentDocument(LocalFrame* frame) {
-  DCHECK(frame);
+static Document* ParentDocument(DocumentLoader* loader) {
+  DCHECK(loader);
+  DCHECK(loader->GetFrame());
 
-  Element* owner_element = frame->DeprecatedLocalOwner();
+  Element* owner_element = loader->GetFrame()->DeprecatedLocalOwner();
   if (!owner_element)
     return nullptr;
   return &owner_element->GetDocument();
@@ -71,33 +72,37 @@ DocumentInit::DocumentInit(const DocumentInit&) = default;
 DocumentInit::~DocumentInit() = default;
 
 bool DocumentInit::ShouldSetURL() const {
-  LocalFrame* frame = FrameForSecurityContext();
-  return (frame && frame->Tree().Parent()) || !url_.IsEmpty();
+  DocumentLoader* loader = MasterDocumentLoader();
+  return (loader && loader->GetFrame()->Tree().Parent()) || !url_.IsEmpty();
 }
 
 bool DocumentInit::ShouldTreatURLAsSrcdocDocument() const {
   return parent_document_ &&
-         frame_->Loader().ShouldTreatURLAsSrcdocDocument(url_);
-}
-
-LocalFrame* DocumentInit::FrameForSecurityContext() const {
-  if (frame_)
-    return frame_;
-  if (imports_controller_)
-    return imports_controller_->Master()->GetFrame();
+         document_loader_->GetFrame()->Loader().ShouldTreatURLAsSrcdocDocument(
+             url_);
+}
+
+DocumentLoader* DocumentInit::MasterDocumentLoader() const {
+  if (document_loader_)
+    return document_loader_;
+  if (imports_controller_) {
+    return imports_controller_->Master()
+        ->GetFrame()
+        ->Loader()
+        .GetDocumentLoader();
+  }
   return nullptr;
 }
 
 SandboxFlags DocumentInit::GetSandboxFlags() const {
-  DCHECK(FrameForSecurityContext());
-  FrameLoader* loader = &FrameForSecurityContext()->Loader();
-  SandboxFlags flags = loader->EffectiveSandboxFlags();
+  DCHECK(MasterDocumentLoader());
+  DocumentLoader* loader = MasterDocumentLoader();
+  SandboxFlags flags = loader->GetFrame()->Loader().EffectiveSandboxFlags();
 
   // If the load was blocked by CSP, force the Document's origin to be unique,
   // so that the blocked document appears to be a normal cross-origin document's
   // load per CSP spec: https://www.w3.org/TR/CSP3/#directive-frame-ancestors.
-  if (loader->GetDocumentLoader() &&
-      loader->GetDocumentLoader()->WasBlockedAfterCSP()) {
+  if (loader->WasBlockedAfterCSP()) {
     flags |= kSandboxOrigin;
   }
 
@@ -105,48 +110,50 @@ SandboxFlags DocumentInit::GetSandboxFlags() const {
 }
 
 WebInsecureRequestPolicy DocumentInit::GetInsecureRequestPolicy() const {
-  DCHECK(FrameForSecurityContext());
-  return FrameForSecurityContext()->Loader().GetInsecureRequestPolicy();
+  DCHECK(MasterDocumentLoader());
+  Frame* parent_frame = MasterDocumentLoader()->GetFrame()->Tree().Parent();
+  if (!parent_frame)
+    return kLeaveInsecureRequestsAlone;
+  return parent_frame->GetSecurityContext()->GetInsecureRequestPolicy();
 }
 
 SecurityContext::InsecureNavigationsSet*
 DocumentInit::InsecureNavigationsToUpgrade() const {
-  DCHECK(FrameForSecurityContext());
-  return FrameForSecurityContext()->Loader().InsecureNavigationsToUpgrade();
+  DCHECK(MasterDocumentLoader());
+  Frame* parent_frame = MasterDocumentLoader()->GetFrame()->Tree().Parent();
+  if (!parent_frame)
+    return nullptr;
+  return parent_frame->GetSecurityContext()->InsecureNavigationsToUpgrade();
 }
 
 bool DocumentInit::IsHostedInReservedIPRange() const {
-  if (LocalFrame* frame = FrameForSecurityContext()) {
-    if (DocumentLoader* loader =
-            frame->Loader().GetProvisionalDocumentLoader()
-                ? frame->Loader().GetProvisionalDocumentLoader()
-                : frame->Loader().GetDocumentLoader()) {
-      if (!loader->GetResponse().RemoteIPAddress().IsEmpty())
-        return NetworkUtils::IsReservedIPAddress(
-            loader->GetResponse().RemoteIPAddress());
+  if (DocumentLoader* loader = MasterDocumentLoader()) {
+    if (!loader->GetResponse().RemoteIPAddress().IsEmpty()) {
+      return NetworkUtils::IsReservedIPAddress(
+          loader->GetResponse().RemoteIPAddress());
     }
   }
   return false;
 }
 
 Settings* DocumentInit::GetSettings() const {
-  DCHECK(FrameForSecurityContext());
-  return FrameForSecurityContext()->GetSettings();
+  DCHECK(MasterDocumentLoader());
+  return MasterDocumentLoader()->GetFrame()->GetSettings();
 }
 
-KURL DocumentInit::ParentBaseURL() const {
-  return parent_document_->BaseURL();
-}
-
-DocumentInit& DocumentInit::WithFrame(LocalFrame* frame) {
-  DCHECK(!frame_);
+DocumentInit& DocumentInit::WithDocumentLoader(DocumentLoader* loader) {
+  DCHECK(!document_loader_);
   DCHECK(!imports_controller_);
-  frame_ = frame;
-  if (frame_)
-    parent_document_ = ParentDocument(frame_);
+  document_loader_ = loader;
+  if (document_loader_)
+    parent_document_ = ParentDocument(document_loader_);
   return *this;
 }
 
+LocalFrame* DocumentInit::GetFrame() const {
+  return document_loader_ ? document_loader_->GetFrame() : nullptr;
+}
+
 DocumentInit& DocumentInit::WithContextDocument(Document* context_document) {
   DCHECK(!context_document_);
   context_document_ = context_document;

third_party/blink/renderer/core/dom/document_init.h

@@ -41,6 +41,7 @@
 namespace blink {
 
 class Document;
+class DocumentLoader;
 class LocalFrame;
 class HTMLImportsController;
 class Settings;
@@ -56,7 +57,7 @@ class CORE_EXPORT DocumentInit final {
   // Example:
   //
   //   DocumentInit init = DocumentInit::Create()
-  //       .WithFrame(frame)
+  //       .WithDocumentLoader(loader)
   //       .WithContextDocument(context_document)
   //       .WithURL(url);
   //   Document* document = Document::Create(init);
@@ -70,21 +71,18 @@ class CORE_EXPORT DocumentInit final {
     return imports_controller_;
   }
 
-  bool HasSecurityContext() const { return FrameForSecurityContext(); }
+  bool HasSecurityContext() const { return MasterDocumentLoader(); }
   bool ShouldTreatURLAsSrcdocDocument() const;
   bool ShouldSetURL() const;
-  bool IsSeamlessAllowedFor(Document* child) const;
   SandboxFlags GetSandboxFlags() const;
   bool IsHostedInReservedIPRange() const;
   WebInsecureRequestPolicy GetInsecureRequestPolicy() const;
   SecurityContext::InsecureNavigationsSet* InsecureNavigationsToUpgrade() const;
 
-  KURL ParentBaseURL() const;
-  LocalFrame* OwnerFrame() const;
   Settings* GetSettings() const;
 
-  DocumentInit& WithFrame(LocalFrame*);
-  LocalFrame* GetFrame() const { return frame_; }
+  DocumentInit& WithDocumentLoader(DocumentLoader*);
+  LocalFrame* GetFrame() const;
 
   // Used by the DOMImplementation and DOMParser to pass their parent Document
   // so that the created Document will return the Document when the
@@ -106,9 +104,13 @@ class CORE_EXPORT DocumentInit final {
  private:
   DocumentInit(HTMLImportsController*);
 
-  LocalFrame* FrameForSecurityContext() const;
+  // For a Document associated directly with a frame, this will be the
+  // DocumentLoader driving the commit. For an import, XSLT-generated
+  // document, etc., it will be the DocumentLoader that drove the commit
+  // of its owning Document.
+  DocumentLoader* MasterDocumentLoader() const;
 
-  Member<LocalFrame> frame_;
+  Member<DocumentLoader> document_loader_;
   Member<Document> parent_document_;
 
   Member<HTMLImportsController> imports_controller_;

third_party/blink/renderer/core/frame/local_frame.cc

@@ -1378,7 +1378,9 @@ void LocalFrame::ForceSynchronousDocumentInstall(
   GetDocument()->Shutdown();
 
   DomWindow()->InstallNewDocument(
-      mime_type, DocumentInit::Create().WithFrame(this), false);
+      mime_type,
+      DocumentInit::Create().WithDocumentLoader(loader_.GetDocumentLoader()),
+      false);
   loader_.StateMachine()->AdvanceTo(
       FrameLoaderStateMachine::kCommittedFirstRealLoad);
 

third_party/blink/renderer/core/html/image_document_test.cc

@@ -105,7 +105,8 @@ void ImageDocumentTest::CreateDocumentWithoutLoadingImage(int view_width,
 
   LocalFrame& frame = dummy_page_holder_->GetFrame();
   frame.GetDocument()->Shutdown();
-  DocumentInit init = DocumentInit::Create().WithFrame(&frame);
+  DocumentInit init = DocumentInit::Create().WithDocumentLoader(
+      frame.Loader().GetDocumentLoader());
   frame.DomWindow()->InstallNewDocument("image/jpeg", init, false);
 }
 

third_party/blink/renderer/core/loader/document_loader.cc

@@ -1091,7 +1091,7 @@ void DocumentLoader::InstallNewDocument(
   Document* document = frame_->DomWindow()->InstallNewDocument(
       mime_type,
       DocumentInit::Create()
-          .WithFrame(frame_)
+          .WithDocumentLoader(this)
           .WithURL(url)
           .WithOwnerDocument(owner_document)
           .WithNewRegistrationContext(),

third_party/blink/renderer/core/loader/frame_loader.cc

@@ -1601,24 +1601,6 @@ SandboxFlags FrameLoader::EffectiveSandboxFlags() const {
   return flags;
 }
 
-WebInsecureRequestPolicy FrameLoader::GetInsecureRequestPolicy() const {
-  Frame* parent_frame = frame_->Tree().Parent();
-  if (!parent_frame)
-    return kLeaveInsecureRequestsAlone;
-
-  return parent_frame->GetSecurityContext()->GetInsecureRequestPolicy();
-}
-
-SecurityContext::InsecureNavigationsSet*
-FrameLoader::InsecureNavigationsToUpgrade() const {
-  DCHECK(frame_);
-  Frame* parent_frame = frame_->Tree().Parent();
-  if (!parent_frame)
-    return nullptr;
-
-  return parent_frame->GetSecurityContext()->InsecureNavigationsToUpgrade();
-}
-
 void FrameLoader::ModifyRequestForCSP(ResourceRequest& resource_request,
                                       Document* origin_document) const {
   if (RuntimeEnabledFeatures::EmbedderCSPEnforcementEnabled() &&

third_party/blink/renderer/core/loader/frame_loader.h

@@ -165,8 +165,6 @@ class CORE_EXPORT FrameLoader final {
   void ForceSandboxFlags(SandboxFlags flags) { forced_sandbox_flags_ |= flags; }
   SandboxFlags EffectiveSandboxFlags() const;
 
-  WebInsecureRequestPolicy GetInsecureRequestPolicy() const;
-  SecurityContext::InsecureNavigationsSet* InsecureNavigationsToUpgrade() const;
   void ModifyRequestForCSP(ResourceRequest&, Document*) const;
 
   Frame* Opener();

third_party/blink/renderer/core/timing/window_performance_test.cc

@@ -144,7 +144,8 @@ TEST_F(WindowPerformanceTest, NavigateAway) {
   EXPECT_TRUE(ObservingLongTasks());
 
   // Simulate navigation commit.
-  DocumentInit init = DocumentInit::Create().WithFrame(GetFrame());
+  DocumentInit init = DocumentInit::Create().WithDocumentLoader(
+      GetFrame()->Loader().GetDocumentLoader());
   GetDocument()->Shutdown();
   GetFrame()->SetDOMWindow(LocalDOMWindow::Create(*GetFrame()));
   GetFrame()->DomWindow()->InstallNewDocument(AtomicString(), init, false);
@@ -178,7 +179,7 @@ TEST(PerformanceLifetimeTest, SurviveContextSwitch) {
   page_holder->GetDocument().Shutdown();
   page_holder->GetFrame().DomWindow()->InstallNewDocument(
       AtomicString(),
-      DocumentInit::Create().WithFrame(&page_holder->GetFrame()), false);
+      DocumentInit::Create().WithDocumentLoader(document_loader), false);
 
   EXPECT_EQ(perf, DOMWindowPerformance::performance(
                       *page_holder->GetFrame().DomWindow()));

third_party/blink/renderer/core/xml/xslt_processor.cc

@@ -70,7 +70,11 @@ Document* XSLTProcessor::CreateDocumentFromSource(
   if (owner_document == source_node)
     url = owner_document->Url();
 
-  DocumentInit init = DocumentInit::Create().WithFrame(frame).WithURL(url);
+  DocumentInit init =
+      DocumentInit::Create()
+          .WithDocumentLoader(frame ? frame->Loader().GetDocumentLoader()
+                                    : nullptr)
+          .WithURL(url);
 
   String document_source = source_string;
   bool force_xhtml = source_mime_type == "text/plain";