DocumentLoader should commit the load before creating a DocumentWriter

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

 /*
  * Copyright (C) 2006, 2007, 2008 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 433 matching lines @@
     }
     DocumentInit init(owner, url(), m_frame);
     init.withNewRegistrationContext();
     m_frame->loader().clear();
     ASSERT(m_frame->page());
 
     ParserSynchronizationPolicy parsingPolicy = AllowAsynchronousParsing;
     if ((m_substituteData.isValid() && m_substituteData.forceSynchronousLoad()) || !Document::threadedParsingEnabledForTesting())
         parsingPolicy = ForceSynchronousParsing;
 
-    m_writer = createWriterFor(init, mimeType, encoding, false, parsingPolicy);
+    m_writer = createWriterFor(init, mimeType, encoding, false, parsingPolicy, overridingURL);
     m_writer->setDocumentWasLoadedAsPartOfNavigation();
-
-    // This should be set before receivedFirstData().
-    if (!overridingURL.isEmpty())
-        m_frame->document()->setBaseURLOverride(overridingURL);
-
-    // Call receivedFirstData() exactly once per load.
-    frameLoader()->receivedFirstData();
     m_frame->document()->maybeHandleHttpRefresh(m_response.httpHeaderField(HTTPNames::Refresh), Document::HttpRefreshFromHeader);
 }
 
 void DocumentLoader::commitData(const char* bytes, size_t length)
 {
     ASSERT(m_state < MainResourceDone);
     ensureWriter(m_response.mimeType());
 
     // This can happen if document.close() is called by an event handler while
     // there's still pending incoming data.
@@ skipping 180 matching lines @@
     m_mainResource->addClient(this);
 }
 
 void DocumentLoader::endWriting(DocumentWriter* writer)
 {
     ASSERT_UNUSED(writer, m_writer == writer);
     m_writer->end();
     m_writer.clear();
 }
 
-DocumentWriter* DocumentLoader::createWriterFor(const DocumentInit& init, const AtomicString& mimeType, const AtomicString& encoding, bool dispatch, ParserSynchronizationPolicy parsingPolicy)
+DocumentWriter* DocumentLoader::createWriterFor(const DocumentInit& init, const AtomicString& mimeType, const AtomicString& encoding, bool dispatch, ParserSynchronizationPolicy parsingPolicy, const KURL& overridingURL)
 {
     LocalFrame* frame = init.frame();
 
     ASSERT(!frame->document() || !frame->document()->isActive());
     ASSERT(frame->tree().childCount() == 0);
 
     if (!init.shouldReuseDefaultView())
         frame->setDOMWindow(LocalDOMWindow::create(*frame));
 
     Document* document = frame->localDOMWindow()->installNewDocument(mimeType, init);
 
     frame->loader().didBeginDocument(dispatch);
 
+    // This should be set before receivedFirstData().
+    if (!overridingURL.isEmpty())
+        frame->document()->setBaseURLOverride(overridingURL);
+
+    if (!dispatch)
+        frame->loader().receivedFirstData();

[jochen (gone - plz use gerrit), 2016/04/20 14:23:25]

this is still after didBeginDocument. Why not move it to before?

[meacer, 2016/04/20 23:51:00]

Had to divide didBeginDocument into two: CSP and saved form data need to be
initialized before committing the load, so I put them in a new
didInstallNewDocument method (naming?). Moved everything else to after
receivedFirstData.

+
     return DocumentWriter::create(document, parsingPolicy, mimeType, encoding);
 }
 
 const AtomicString& DocumentLoader::mimeType() const
 {
     if (m_writer)
         return m_writer->mimeType();
     return m_response.mimeType();
 }
 
 // This is only called by FrameLoader::replaceDocumentWhileExecutingJavaScriptURL()
 void DocumentLoader::replaceDocumentWhileExecutingJavaScriptURL(const DocumentInit& init, const String& source)
 {
     m_writer = createWriterFor(init, mimeType(), m_writer ? m_writer->encoding() : emptyAtom, true, ForceSynchronousParsing);
     if (!source.isNull())
         m_writer->appendReplacingData(source);
     endWriting(m_writer.get());
 }
 
 DEFINE_WEAK_IDENTIFIER_MAP(DocumentLoader);
 
 } // namespace blink