Drop GetFrame()->GetDocument() usage in FrameFetchContext

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

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 335 matching lines @@
           document_loader_->GetFrame()->Loader().ProvisionalDocumentLoader()) {
     FrameClientHintsPreferencesContext hints_context(GetFrame());
     document_loader_->GetClientHintsPreferences()
         .UpdateFromAcceptClientHintsHeader(
             response.HttpHeaderField(HTTPNames::Accept_CH), &hints_context);
     // When response is received with a provisional docloader, the resource
     // haven't committed yet, and we cannot load resources, only preconnect.
     resource_loading_policy = LinkLoader::kDoNotLoadResources;
   }
   LinkLoader::LoadLinksFromHeader(
-      response.HttpHeaderField(HTTPNames::Link), response.Url(),
-      GetFrame()->GetDocument(), NetworkHintsInterfaceImpl(),
-      resource_loading_policy, LinkLoader::kLoadAll, nullptr);
+      response.HttpHeaderField(HTTPNames::Link), response.Url(), *GetFrame(),
+      GetDocument(), NetworkHintsInterfaceImpl(), resource_loading_policy,
+      LinkLoader::kLoadAll, nullptr);
 
   if (response.HasMajorCertificateErrors()) {
     MixedContentChecker::HandleCertificateError(GetFrame(), response,
                                                 frame_type, request_context);
   }
 
   GetFrame()->Loader().Progress().IncrementProgress(identifier, response);
   GetLocalFrameClient()->DispatchDidReceiveResponse(response);
   DocumentLoader* document_loader = MasterDocumentLoader();
   probe::didReceiveResourceResponse(GetFrame(), identifier, document_loader,
@@ skipping 195 matching lines @@
 }
 
 void FrameFetchContext::SendImagePing(const KURL& url) {
   PingLoader::LoadImage(GetFrame(), url);
 }
 
 void FrameFetchContext::AddConsoleMessage(const String& message,
                                           LogMessageType message_type) const {
   MessageLevel level = message_type == kLogWarningMessage ? kWarningMessageLevel
                                                           : kErrorMessageLevel;
-  if (GetFrame()->GetDocument()) {
-    GetFrame()->GetDocument()->AddConsoleMessage(
-        ConsoleMessage::Create(kJSMessageSource, level, message));
-  }
+  ConsoleMessage* console_message =
+      ConsoleMessage::Create(kJSMessageSource, level, message);
+  // Route the console message through Document if it's attached, so
+  // that script line numbers can be included. Otherwise, route directly to the
+  // FrameConsole, to ensure we never drop a message.
+  if (GetDocument() && GetDocument()->GetFrame())
+    GetDocument()->AddConsoleMessage(console_message);
+  else
+    GetFrame()->Console().AddMessage(console_message);
 }
 
 void FrameFetchContext::ModifyRequestForCSP(ResourceRequest& resource_request) {
   // Record the latest requiredCSP value that will be used when sending this
   // request.
   GetFrame()->Loader().RecordLatestRequiredCSP();
   GetFrame()->Loader().ModifyRequestForCSP(resource_request, GetDocument());
 }
 
 void FrameFetchContext::AddClientHintsIfNecessary(
@@ skipping 109 matching lines @@
 Settings* FrameFetchContext::GetSettings() const {
   DCHECK(GetFrame());
   return GetFrame()->GetSettings();
 }
 
 SubresourceFilter* FrameFetchContext::GetSubresourceFilter() const {
   DocumentLoader* document_loader = MasterDocumentLoader();
   return document_loader ? document_loader->GetSubresourceFilter() : nullptr;
 }
 
-SecurityContext* FrameFetchContext::GetMainResourceSecurityContext() const {
-  DCHECK(GetFrame()->GetDocument());
-  return GetFrame()->GetDocument();
+SecurityContext* FrameFetchContext::GetParentSecurityContext() const {
+  if (Frame* parent = GetFrame()->Tree().Parent())
+    return parent->GetSecurityContext();
+  return nullptr;
 }
 
 bool FrameFetchContext::ShouldBlockRequestByInspector(
     const ResourceRequest& resource_request) const {
   bool should_block_request = false;
   probe::shouldBlockRequest(GetFrame(), resource_request,
                             &should_block_request);
   return should_block_request;
 }
 
@@ skipping 11 matching lines @@
 
 bool FrameFetchContext::ShouldBypassMainWorldCSP() const {
   return GetFrame()->GetScriptController().ShouldBypassMainWorldCSP();
 }
 
 bool FrameFetchContext::IsSVGImageChromeClient() const {
   return GetFrame()->GetChromeClient().IsSVGImageChromeClient();
 }
 
 void FrameFetchContext::CountUsage(UseCounter::Feature feature) const {
-  UseCounter::Count(GetFrame()->GetDocument(), feature);
+  UseCounter::Count(GetFrame(), feature);
 }
 
 void FrameFetchContext::CountDeprecation(UseCounter::Feature feature) const {
-  Deprecation::CountDeprecation(GetFrame()->GetDocument(), feature);
+  Deprecation::CountDeprecation(GetFrame(), feature);
 }
 
 bool FrameFetchContext::ShouldBlockFetchByMixedContentCheck(
     const ResourceRequest& resource_request,
     const KURL& url,
     SecurityViolationReportingPolicy reporting_policy) const {
   return MixedContentChecker::ShouldBlockFetch(GetFrame(), resource_request,
                                                url, reporting_policy);
 }
 
 std::unique_ptr<WebURLLoader> FrameFetchContext::CreateURLLoader() {
   return Platform::Current()->CreateURLLoader();
 }
 
 DEFINE_TRACE(FrameFetchContext) {
   visitor->Trace(document_loader_);
   BaseFetchContext::Trace(visitor);
 }
 
 }  // namespace blink