Finish removing FrameLoader::Clear()

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 651 matching lines @@
   // origin is inherited from the document that loaded the URL.
   if (Document::ShouldInheritSecurityOriginFromOwner(Url())) {
     Frame* owner_frame = frame_->Tree().Parent();
     if (!owner_frame)
       owner_frame = frame_->Loader().Opener();
     if (owner_frame && owner_frame->IsLocalFrame())
       owner = ToLocalFrame(owner_frame)->GetDocument();
   }
   DocumentInit init(owner, Url(), frame_);
   init.WithNewRegistrationContext();
-  frame_->Loader().Clear();
   DCHECK(frame_->GetPage());
 
   ParserSynchronizationPolicy parsing_policy = kAllowAsynchronousParsing;
   if ((substitute_data_.IsValid() && substitute_data_.ForceSynchronousLoad()) ||
       !Document::ThreadedParsingEnabledForTesting())
     parsing_policy = kForceSynchronousParsing;
 
   InstallNewDocument(init, mime_type, encoding,
                      InstallNewDocumentReason::kNavigation, parsing_policy,
                      overriding_url);
@@ skipping 362 matching lines @@
     const DocumentInit& init,
     const AtomicString& mime_type,
     const AtomicString& encoding,
     InstallNewDocumentReason reason,
     ParserSynchronizationPolicy parsing_policy,
     const KURL& overriding_url) {
   DCHECK_EQ(init.GetFrame(), frame_);
   DCHECK(!frame_->GetDocument() || !frame_->GetDocument()->IsActive());
   DCHECK_EQ(frame_->Tree().ChildCount(), 0u);
 
+  if (GetFrameLoader().StateMachine()->IsDisplayingInitialEmptyDocument()) {
+    GetFrameLoader().StateMachine()->AdvanceTo(
+        FrameLoaderStateMachine::kCommittedFirstRealLoad);

[Nate Chapin, 2017/05/17 18:18:59]

This feels like a slightly weird place for this, but I don't have a better
idea...

[dcheng, 2017/05/22 21:23:26]

Hmm... I think this is OK.

+  }
+
   SecurityOrigin* previous_security_origin = nullptr;
   if (frame_->GetDocument())
     previous_security_origin = frame_->GetDocument()->GetSecurityOrigin();
 
   if (!init.ShouldReuseDefaultView())
     frame_->SetDOMWindow(LocalDOMWindow::Create(*frame_));
 
   Document* document = frame_->DomWindow()->InstallNewDocument(mime_type, init);
 
   if (ShouldClearWindowName(*frame_, previous_security_origin, *document)) {
@@ skipping 43 matching lines @@
                      InstallNewDocumentReason::kJavascriptURL,
                      kForceSynchronousParsing, KURL());
   if (!source.IsNull())
     writer_->AppendReplacingData(source);
   EndWriting();
 }
 
 DEFINE_WEAK_IDENTIFIER_MAP(DocumentLoader);
 
 }  // namespace blink