Clean up DocumentWriter creation's FrameLoader interaction

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

 /*
  * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2011 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:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
@@ skipping 148 matching lines @@
   DocumentLoadTiming& timing() { return m_documentLoadTiming; }
   const DocumentLoadTiming& timing() const { return m_documentLoadTiming; }
 
   ApplicationCacheHost* applicationCacheHost() const {
     return m_applicationCacheHost.get();
   }
 
   void clearRedirectChain();
   void appendRedirect(const KURL&);
 
-  ContentSecurityPolicy* releaseContentSecurityPolicy() {
-    return m_contentSecurityPolicy.release();
-  }
-
   ClientHintsPreferences& clientHintsPreferences() {
     return m_clientHintsPreferences;
   }
 
   struct InitialScrollState {
     DISALLOW_NEW();
     InitialScrollState()
         : wasScrolledByUser(false), didRestoreFromHistory(false) {}
 
     bool wasScrolledByUser;
@@ skipping 26 matching lines @@
 
  protected:
   DocumentLoader(LocalFrame*,
                  const ResourceRequest&,
                  const SubstituteData&,
                  ClientRedirectPolicy);
 
   Vector<KURL> m_redirectChain;
 
  private:
-  static DocumentWriter* createWriterFor(const DocumentInit&,

[Nate Chapin, 2017/03/17 23:33:18]

This method (1) does enough DocumentLoader-related stuff that I think non-static
is better, (2) does more than creating a DocumentWriter, renamed accordingly.

[Mike West, 2017/03/21 09:39:30]

Maybe add a comment explaining the scope?

[Nate Chapin, 2017/03/21 19:26:58]

Done.

-                                         const AtomicString& mimeType,
-                                         const AtomicString& encoding,
-                                         bool dispatchWindowObjectAvailable,
-                                         ParserSynchronizationPolicy,
-                                         const KURL& overridingURL = KURL());
+  enum class InstallNewDocumentReason { kNavigation, kJavascriptURL };
+  void installNewDocument(const DocumentInit&,
+                          const AtomicString& mimeType,
+                          const AtomicString& encoding,
+                          InstallNewDocumentReason,
+                          ParserSynchronizationPolicy,
+                          const KURL& overridingURL);
+  void didInstallNewDocument(Document*);
+  void didCommitNavigation();
 
   void ensureWriter(const AtomicString& mimeType,
                     const KURL& overridingURL = KURL());
   void endWriting();
 
   // Use these method only where it's guaranteed that |m_frame| hasn't been
   // cleared.
   FrameLoader& frameLoader() const;
   LocalFrameClient& localFrameClient() const;
 
@@ skipping 89 matching lines @@
   // Used to protect against reentrancy into dataReceived().
   bool m_inDataReceived;
   RefPtr<SharedBuffer> m_dataBuffer;
 };
 
 DECLARE_WEAK_IDENTIFIER_MAP(DocumentLoader);
 
 }  // namespace blink
 
 #endif  // DocumentLoader_h