Clean up around FrameFetchContext

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

 /*
  * 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 32 matching lines @@
 
 class Document;
 class DocumentLoader;
 class LocalFrame;
 class ResourceError;
 class ResourceResponse;
 class ResourceRequest;
 
 class CORE_EXPORT FrameFetchContext final : public FetchContext {
  public:
-  static ResourceFetcher* createContextAndFetcher(DocumentLoader* loader,
-                                                  Document* document) {
-    return ResourceFetcher::create(new FrameFetchContext(loader, document));
+  static ResourceFetcher* createFetcherFromDocumentLoader(
+      DocumentLoader* loader) {
+    return ResourceFetcher::create(new FrameFetchContext(loader, nullptr));
+  }
+  static ResourceFetcher* createFetcherFromDocument(Document* document) {
+    return ResourceFetcher::create(new FrameFetchContext(nullptr, document));
   }
 
   static void provideDocumentToContext(FetchContext& context,
                                        Document* document) {
     DCHECK(document);
     CHECK(context.isLiveContext());
     static_cast<FrameFetchContext&>(context).m_document = document;
   }
 
   ~FrameFetchContext();
@@ skipping 82 matching lines @@
 
   void countClientHintsDPR() override;
   void countClientHintsResourceWidth() override;
   void countClientHintsViewportWidth() override;
 
   WebTaskRunner* loadingTaskRunner() const override;
 
   DECLARE_VIRTUAL_TRACE();
 
  private:
-  explicit FrameFetchContext(DocumentLoader*, Document*);
+  FrameFetchContext(DocumentLoader*, Document*);
   inline DocumentLoader* masterDocumentLoader() const;
 
-  LocalFrame* frame() const;  // Can be null
+  LocalFrame* frameOfImportsController() const;
+  LocalFrame* frame() const;
   void printAccessDeniedMessage(const KURL&) const;
   ResourceRequestBlockedReason canRequestInternal(
       Resource::Type,
       const ResourceRequest&,
       const KURL&,
       const ResourceLoaderOptions&,
       bool forPreload,
       FetchRequest::OriginRestriction,
       ResourceRequest::RedirectStatus) const;
 
   void prepareRequest(ResourceRequest&);
 
   void dispatchDidReceiveResponseInternal(unsigned long identifier,
                                           const ResourceResponse&,
                                           WebURLRequest::FrameType,
                                           WebURLRequest::RequestContext,
                                           Resource*,
                                           LinkLoader::CanLoadResources);
 
   // FIXME: Oilpan: Ideally this should just be a traced Member but that will
   // currently leak because ComputedStyle and its data are not on the heap.
   // See crbug.com/383860 for details.
   WeakMember<Document> m_document;
   Member<DocumentLoader> m_documentLoader;
 };
 
 }  // namespace blink
 
 #endif