Finish removing FrameLoader::Clear()

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

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights
  * reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
  * (http://www.torchmobile.com/)
  * Copyright (C) 2008 Alp Toker <alp@atoker.com>
  * Copyright (C) Research In Motion Limited 2009. All rights reserved.
  * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com>
  * Copyright (C) 2011 Google Inc. All rights reserved.
@@ skipping 26 matching lines @@
 #include "core/loader/FrameLoader.h"
 
 #include <memory>
 #include "bindings/core/v8/ScriptController.h"
 #include "bindings/core/v8/serialization/SerializedScriptValue.h"
 #include "core/HTMLNames.h"
 #include "core/dom/Document.h"
 #include "core/dom/Element.h"
 #include "core/dom/TaskRunnerHelper.h"
 #include "core/dom/ViewportDescription.h"
-#include "core/editing/Editor.h"
 #include "core/events/GestureEvent.h"
 #include "core/events/KeyboardEvent.h"
 #include "core/events/MouseEvent.h"
 #include "core/events/PageTransitionEvent.h"
 #include "core/frame/ContentSettingsClient.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalDOMWindow.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/LocalFrameClient.h"
 #include "core/frame/Settings.h"
@@ skipping 293 matching lines @@
     }
   }
 
   // Prevent window.open(url) -- eg window.open("about:blank") -- from blowing
   // away results from a subsequent window.document.open / window.document.write
   // call. Canceling redirection here works for all cases because document.open
   // implicitly precedes document.write.
   frame_->GetNavigationScheduler().Cancel();
 }
 
-void FrameLoader::Clear() {
-  // clear() is called during (Local)Frame detachment or when reusing a
-  // FrameLoader by putting a new Document within it
-  // (DocumentLoader::ensureWriter().)
-  if (state_machine_.CreatingInitialEmptyDocument())
-    return;
-
-  frame_->GetEditor().Clear();

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

Move this and the next line to LocalFrame::DocumentAttached(). I think this
means it'll get called for the initial empty document, but that should be
benign.

-  frame_->GetEventHandler().Clear();
-  if (frame_->View())
-    frame_->View()->Clear();

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

We just got a new FrameView, no need to clear it.

-
-  if (state_machine_.IsDisplayingInitialEmptyDocument())
-    state_machine_.AdvanceTo(FrameLoaderStateMachine::kCommittedFirstRealLoad);

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

Moved to DocumentLoader.

-
-  TakeObjectSnapshot();
-}
-
 // This is only called by ScriptController::executeScriptIfJavaScriptURL and
 // always contains the result of evaluating a javascript: url. This is the
 // <iframe src="javascript:'html'"> case.
 void FrameLoader::ReplaceDocumentWhileExecutingJavaScriptURL(
     const String& source,
     Document* owner_document) {
   if (!frame_->GetDocument()->Loader() ||
       frame_->GetDocument()->PageDismissalEventBeingDispatched() !=
           Document::kNoDismissal)
     return;
 
   DocumentLoader* document_loader(frame_->GetDocument()->Loader());
 
   UseCounter::Count(*frame_->GetDocument(),
                     UseCounter::kReplaceDocumentViaJavaScriptURL);
 
   // Prepare a DocumentInit before clearing the frame, because it may need to
   // inherit an aliased security context.
   DocumentInit init(owner_document, frame_->GetDocument()->Url(), frame_);
   init.WithNewRegistrationContext();
 
   StopAllLoaders();
   // Don't allow any new child frames to load in this frame: attaching a new
   // child frame during or after detaching children results in an attached
   // frame on a detached DOM tree, which is bad.
   SubframeLoadingDisabler disabler(frame_->GetDocument());
   frame_->DetachChildren();
   frame_->GetDocument()->Shutdown();
-  Clear();
 
   // detachChildren() potentially detaches the frame from the document. The
   // loading cannot continue in that case.
   if (!frame_->GetPage())
     return;
 
   Client()->TransitionToCommittedForNewPage();
   document_loader->ReplaceDocumentWhileExecutingJavaScriptURL(init, source);
 }
 
@@ skipping 1293 matching lines @@
   // TODO(japhet): This is needed because the browser process DCHECKs if the
   // first entry we commit in a new frame has replacement set. It's unclear
   // whether the DCHECK is right, investigate removing this special case.
   bool replace_current_item = load_type == kFrameLoadTypeReplaceCurrentItem &&
                               (!Opener() || !request.Url().IsEmpty());
   loader->SetReplacesCurrentHistoryItem(replace_current_item);
   return loader;
 }
 
 }  // namespace blink