Reland "Simplify FrameLoader::Clear(), remove FrameLoader::check_timer"

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 221 matching lines @@
                                        kFrameLoadTypeReloadBypassingCache
                                    ? WebURLRequest::ServiceWorkerMode::kNone
                                    : WebURLRequest::ServiceWorkerMode::kAll);
   return request;
 }
 
 FrameLoader::FrameLoader(LocalFrame* frame)
     : frame_(frame),
       progress_tracker_(ProgressTracker::Create(frame)),
       in_stop_all_loaders_(false),
-      check_timer_(TaskRunnerHelper::Get(TaskType::kNetworking, frame),
-                   this,
-                   &FrameLoader::CheckTimerFired),
       forced_sandbox_flags_(kSandboxNone),
       dispatching_did_clear_window_object_in_main_world_(false),
       protect_provisional_loader_(false),
       detached_(false) {
   DCHECK(frame_);
   TRACE_EVENT_OBJECT_CREATED_WITH_ID("loading", "FrameLoader", this);
   TakeObjectSnapshot();
 }
 
 FrameLoader::~FrameLoader() {
@@ skipping 41 matching lines @@
     provisional_document_loader_->Fetcher()->SetDefersLoading(defers);
 
   if (Document* document = frame_->GetDocument()) {
     document->Fetcher()->SetDefersLoading(defers);
     if (defers)
       document->SuspendScheduledTasks();
     else
       document->ResumeScheduledTasks();
   }
 
-  if (!defers) {
+  if (!defers)
     frame_->GetNavigationScheduler().StartTimer();
-    ScheduleCheckCompleted();
-  }
 }
 
 void FrameLoader::SaveScrollState() {
   if (!document_loader_ || !document_loader_->GetHistoryItem() ||
       !frame_->View())
     return;
 
   // Shouldn't clobber anything if we might still restore later.
   if (NeedsHistoryItemRestore(document_loader_->LoadType()) &&
       !document_loader_->GetInitialScrollState().was_scrolled_by_user)
@@ skipping 47 matching lines @@
 }
 
 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();
-  frame_->GetDocument()->RemoveFocusedElementOfSubtree(frame_->GetDocument());
   frame_->GetEventHandler().Clear();
   if (frame_->View())
     frame_->View()->Clear();
 
-  frame_->GetScriptController().EnableEval();
-
-  frame_->GetNavigationScheduler().Cancel();
-
-  check_timer_.Stop();
-
   if (state_machine_.IsDisplayingInitialEmptyDocument())
     state_machine_.AdvanceTo(FrameLoaderStateMachine::kCommittedFirstRealLoad);
 
   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(
@@ skipping 85 matching lines @@
     if (document_loader_)
       document_loader_->SetLoadType(kFrameLoadTypeStandard);
     frame_->DomWindow()->FinishedLoading();
   }
 
   Frame* parent = frame_->Tree().Parent();
   if (parent && parent->IsLocalFrame())
     ToLocalFrame(parent)->GetDocument()->CheckCompleted();
 }
 
-void FrameLoader::CheckTimerFired(TimerBase*) {
-  if (Page* page = frame_->GetPage()) {
-    if (page->Suspended())
-      return;
-  }
-  frame_->GetDocument()->CheckCompleted();
-}
-
-void FrameLoader::ScheduleCheckCompleted() {
-  if (!check_timer_.IsActive())
-    check_timer_.StartOneShot(0, BLINK_FROM_HERE);
-}
-
 Frame* FrameLoader::Opener() {
   return Client() ? Client()->Opener() : 0;
 }
 
 void FrameLoader::SetOpener(LocalFrame* opener) {
   // If the frame is already detached, the opener has already been cleared.
   if (Client())
     Client()->SetOpener(opener);
 }
 
@@ skipping 458 matching lines @@
     if (child->IsLocalFrame())
       ToLocalFrame(child)->Loader().StopAllLoaders();
   }
 
   frame_->GetDocument()->CancelParsing();
   if (document_loader_)
     document_loader_->Fetcher()->StopFetching();
   if (!protect_provisional_loader_)
     DetachDocumentLoader(provisional_document_loader_);
 
-  check_timer_.Stop();
   frame_->GetNavigationScheduler().Cancel();
 
   // It's possible that the above actions won't have stopped loading if load
   // completion had been blocked on parsing or if we were in the middle of
   // committing an empty document. In that case, emulate a failed navigation.
   if (!provisional_document_loader_ && document_loader_ &&
       frame_->IsLoading()) {
     document_loader_->LoadFailed(
         ResourceError::CancelledError(document_loader_->Url()));
   }
@@ skipping 207 matching lines @@
 String FrameLoader::UserAgent() const {
   String user_agent = Client()->UserAgent();
   probe::applyUserAgentOverride(frame_, &user_agent);
   return user_agent;
 }
 
 void FrameLoader::Detach() {
   DetachDocumentLoader(document_loader_);
   DetachDocumentLoader(provisional_document_loader_);
 
-  Frame* parent = frame_->Tree().Parent();
-  if (parent && parent->IsLocalFrame())
-    ToLocalFrame(parent)->Loader().ScheduleCheckCompleted();
   if (progress_tracker_) {
     progress_tracker_->Dispose();
     progress_tracker_.Clear();
   }
 
   TRACE_EVENT_OBJECT_DELETED_WITH_ID("loading", "FrameLoader", this);
   detached_ = true;
 }
 
 void FrameLoader::DetachProvisionalDocumentLoader(DocumentLoader* loader) {
@@ skipping 258 matching lines @@
          navigation_policy == kNavigationPolicyHandledByClient);
 
   provisional_document_loader_ = CreateDocumentLoader(
       resource_request, frame_load_request, type, navigation_type);
 
   // PlzNavigate: We need to ensure that script initiated navigations are
   // honored.
   if (!had_placeholder_client_document_loader ||
       navigation_policy == kNavigationPolicyHandledByClient) {
     frame_->GetNavigationScheduler().Cancel();
-    check_timer_.Stop();
   }
 
   if (frame_load_request.Form())
     Client()->DispatchWillSubmitForm(frame_load_request.Form());
 
   provisional_document_loader_->AppendRedirect(
       provisional_document_loader_->GetRequest().Url());
 
   if (IsBackForwardLoadType(type)) {
     DCHECK(history_item);
@@ skipping 240 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