Revert of Move most of FrameLoader::CheckCompleted() to Document

third_party/WebKit/Source/core/dom/Document.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  *           (C) 2006 Alexey Proskuryakov (ap@webkit.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All
  * rights reserved.
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
  * (http://www.torchmobile.com/)
  * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved.
@@ skipping 470 matching lines @@
       contains_validity_style_rules_(false),
       contains_plugins_(false),
       ignore_destructive_write_count_(0),
       throw_on_dynamic_markup_insertion_count_(0),
       markers_(new DocumentMarkerController(*this)),
       update_focus_appearance_timer_(
           TaskRunnerHelper::Get(TaskType::kUnspecedTimer, this),
           this,
           &Document::UpdateFocusAppearanceTimerFired),
       css_target_(nullptr),
-      load_event_progress_(kLoadEventCompleted),
+      load_event_progress_(kLoadEventNotRun),
       start_time_(CurrentTime()),
       script_runner_(ScriptRunner::Create(this)),
       xml_version_("1.0"),
       xml_standalone_(kStandaloneUnspecified),
       has_xml_declaration_(0),
       design_mode_(false),
       is_running_exec_command_(false),
       has_annotated_regions_(false),
       annotated_regions_dirty_(false),
       document_classes_(document_classes),
@@ skipping 2261 matching lines @@
   RemoveAllEventListenersRecursively();
   ResetTreeScope();
   if (frame_)
     frame_->Selection().Clear();
   ImplicitOpen(kForceSynchronousParsing);
   if (ScriptableDocumentParser* parser = GetScriptableDocumentParser())
     parser->SetWasCreatedByScript(true);
 
   if (frame_)
     frame_->Loader().DidExplicitOpen();
+  if (load_event_progress_ != kLoadEventInProgress &&
+      PageDismissalEventBeingDispatched() == kNoDismissal)
+    load_event_progress_ = kLoadEventNotRun;
 }
 
 void Document::DetachParser() {
   if (!parser_)
     return;
   parser_->Detach();
   parser_.Clear();
   DocumentParserTiming::From(*this).MarkParserDetached();
 }
 
 void Document::CancelParsing() {
   DetachParser();
   SetParsingState(kFinishedParsing);
   SetReadyState(kComplete);
-  SuppressLoadEvent();
 }
 
 DocumentParser* Document::ImplicitOpen(
     ParserSynchronizationPolicy parser_sync_policy) {
+  DetachParser();
+
   RemoveChildren();
   DCHECK(!focused_element_);
 
   SetCompatibilityMode(kNoQuirksMode);
 
   if (!ThreadedParsingEnabledForTesting()) {
     parser_sync_policy = kForceSynchronousParsing;
   } else if (parser_sync_policy == kAllowAsynchronousParsing &&
              IsPrefetchOnly()) {
     // Prefetch must be synchronous.
     parser_sync_policy = kForceSynchronousParsing;
   }
 
-  DetachParser();
   parser_sync_policy_ = parser_sync_policy;
   parser_ = CreateParser();
   DocumentParserTiming::From(*this).MarkParserStart();
   SetParsingState(kParsing);
   SetReadyState(kLoading);
-  if (load_event_progress_ != kLoadEventInProgress &&
-      PageDismissalEventBeingDispatched() == kNoDismissal) {
-    load_event_progress_ = kLoadEventNotRun;
-  }
 
   return parser_;
 }
 
 HTMLElement* Document::body() const {
   if (!documentElement() || !isHTMLHtmlElement(documentElement()))
     return 0;
 
   for (HTMLElement* child =
            Traversal<HTMLElement>::FirstChild(*documentElement());
@@ skipping 121 matching lines @@
 
   close();
 }
 
 void Document::close() {
   if (!GetScriptableDocumentParser() ||
       !GetScriptableDocumentParser()->WasCreatedByScript() ||
       !GetScriptableDocumentParser()->IsParsing())
     return;
 
-  parser_->Finish();
-  if (!parser_ || !parser_->IsParsing())
-    SetReadyState(kComplete);
-  CheckCompleted();
+  if (DocumentParser* parser = parser_)
+    parser->Finish();
+
+  if (!frame_) {
+    // Because we have no frame, we don't know if all loading has completed,
+    // so we just call implicitClose() immediately. FIXME: This might fire
+    // the load event prematurely
+    // <http://bugs.webkit.org/show_bug.cgi?id=14568>.
+    ImplicitClose();
+    return;
+  }
+
+  frame_->Loader().CheckCompleted();
 }
 
 void Document::ImplicitClose() {
   DCHECK(!InStyleRecalc());
-  DCHECK(parser_);
+  if (ProcessingLoadEvent() || !parser_)
+    return;
+  if (GetFrame() &&
+      GetFrame()->GetNavigationScheduler().LocationChangePending()) {
+    SuppressLoadEvent();
+    return;
+  }
 
   load_event_progress_ = kLoadEventInProgress;
 
   ScriptableDocumentParser* parser = GetScriptableDocumentParser();
   well_formed_ = parser && parser->WellFormed();
 
   // We have to clear the parser, in case someone document.write()s from the
   // onLoad event handler, as in Radar 3206524.
   DetachParser();
 
@@ skipping 61 matching lines @@
         cache->HandleLoadComplete(this);
       else
         cache->HandleLayoutComplete(this);
     }
   }
 
   if (SvgExtensions())
     AccessSVGExtensions().StartAnimations();
 }
 
-static bool AllDescendantsAreComplete(Frame* frame) {
-  if (!frame)
-    return true;
-  for (Frame* child = frame->Tree().FirstChild(); child;
-       child = child->Tree().TraverseNext(frame)) {
-    if (child->IsLoading())
-      return false;
-  }
-  return true;
-}
-
-bool Document::ShouldComplete() {
-  return parsing_state_ == kFinishedParsing && HaveImportsLoaded() &&
-         !fetcher_->BlockingRequestCount() && !IsDelayingLoadEvent() &&
-         load_event_progress_ != kLoadEventInProgress &&
-         AllDescendantsAreComplete(frame_);
-}
-
-void Document::CheckCompleted() {
-  if (!ShouldComplete())
-    return;
-
-  if (frame_) {
-    frame_->Client()->RunScriptsAtDocumentIdle();
-
-    // Injected scripts may have disconnected this frame.
-    if (!frame_)
-      return;
-
-    // Check again, because runScriptsAtDocumentIdle() may have delayed the load
-    // event.
-    if (!ShouldComplete())
-      return;
-  }
-
-  // OK, completed. Fire load completion events as needed.
-  SetReadyState(kComplete);
-  if (LoadEventStillNeeded())
-    ImplicitClose();
-
-  // The readystatechanged or load event may have disconnected this frame.
-  if (!frame_ || !frame_->IsAttached())
-    return;
-  frame_->GetNavigationScheduler().StartTimer();
-  View()->HandleLoadCompleted();
-  // The document itself is complete, but if a child frame was restarted due to
-  // an event, this document is still considered to be in progress.
-  if (!AllDescendantsAreComplete(frame_))
-    return;
-
-  // No need to repeat if we've already notified this load as finished.
-  if (!Loader()->SentDidFinishLoad()) {
-    if (frame_->IsMainFrame())
-      ViewportDescription().ReportMobilePageStats(frame_);
-    Loader()->SetSentDidFinishLoad();
-    frame_->Client()->DispatchDidFinishLoad();
-    if (!frame_)
-      return;
-  }
-
-  frame_->Loader().DidFinishNavigation();
-}
-
 bool Document::DispatchBeforeUnloadEvent(ChromeClient& chrome_client,
                                          bool is_reload,
                                          bool& did_allow_navigation) {
   if (!dom_window_)
     return true;
 
   if (!body())
     return true;
 
   if (ProcessingBeforeUnload())
@@ skipping 2903 matching lines @@
   --load_event_delay_count_;
 
   if (!load_event_delay_count_)
     CheckLoadEventSoon();
 }
 
 void Document::DecrementLoadEventDelayCountAndCheckLoadEvent() {
   DCHECK(load_event_delay_count_);
   --load_event_delay_count_;
 
-  if (!load_event_delay_count_)
-    CheckCompleted();
+  if (!load_event_delay_count_ && GetFrame())
+    GetFrame()->Loader().CheckCompleted();
 }
 
 void Document::CheckLoadEventSoon() {
   if (GetFrame() && !load_event_delay_timer_.IsActive())
     load_event_delay_timer_.StartOneShot(0, BLINK_FROM_HERE);
 }
 
 bool Document::IsDelayingLoadEvent() {
   // Always delay load events until after garbage collection.
   // This way we don't have to explicitly delay load events via
   // incrementLoadEventDelayCount and decrementLoadEventDelayCount in
   // Node destructors.
   if (ThreadState::Current()->SweepForbidden()) {
     if (!load_event_delay_count_)
       CheckLoadEventSoon();
     return true;
   }
   return load_event_delay_count_;
 }
 
 void Document::LoadEventDelayTimerFired(TimerBase*) {
-  CheckCompleted();
+  if (GetFrame())
+    GetFrame()->Loader().CheckCompleted();
 }
 
 void Document::LoadPluginsSoon() {
   // FIXME: Remove this timer once we don't need to compute layout to load
   // plugins.
   if (!plugin_loading_timer_.IsActive())
     plugin_loading_timer_.StartOneShot(0, BLINK_FROM_HERE);
 }
 
 void Document::PluginLoadingTimerFired(TimerBase*) {
@@ skipping 647 matching lines @@
 }
 
 void showLiveDocumentInstances() {
   WeakDocumentSet& set = liveDocumentSet();
   fprintf(stderr, "There are %u documents currently alive:\n", set.size());
   for (blink::Document* document : set)
     fprintf(stderr, "- Document %p URL: %s\n", document,
             document->Url().GetString().Utf8().Data());
 }
 #endif