Prepare blink to unify definitions of load completion

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.
  *
  * Redistribution and use in source and binary forms, with or without
@@ skipping 211 matching lines @@
     stopLoading();
 
     if (Page* page = m_frame->page())
         page->undoStack().didUnloadFrame(*m_frame);
     return true;
 }
 
 void FrameLoader::didExplicitOpen()
 {
     // Calling document.open counts as committing the first real document load.
-    if (!m_stateMachine.committedFirstRealDocumentLoad())
+    if (!m_stateMachine.committedFirstRealDocumentLoad()) {
         m_stateMachine.advanceTo(FrameLoaderStateMachine::CommittedFirstRealLoad);
+        m_progressTracker->progressStarted();

[Nate Chapin, 2014/09/15 23:39:35]

Similar to a javascript url, an explicit open() in an initial empty document
should count as a start.

+    }
 
     // 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.
     m_frame->navigationScheduler().cancel();
 }
 
 void FrameLoader::clear()
 {
@@ skipping 685 matching lines @@
 bool FrameLoader::isLoadingMainFrame() const
 {
     return m_frame->isMainFrame();
 }
 
 FrameLoadType FrameLoader::loadType() const
 {
     return m_loadType;
 }
 
+#if defined(ENABLE_LOAD_COMPLETION_HACKS)
 // This function is an incomprehensible mess and is only used in checkLoadCompleteForThisFrame.
 // If you're thinking of using it elsewhere, stop right now and reconsider your life.
 static bool isDocumentDoneLoading(Document* document)
 {
     if (!document->loader())
         return true;
     if (document->loader()->isLoadingMainResource())
         return false;
-    if (!document->loadEventFinished()) {
-        if (document->loader()->isLoading() || document->isDelayingLoadEvent())
-            return false;
-    }
+    if (!document->loadEventFinished())
+        return false;
     if (document->fetcher()->requestCount())
         return false;
     if (document->processingLoadEvent())
         return false;
-    if (document->hasActiveParser())
-        return false;
     return true;
 }
+#endif
 
 bool FrameLoader::checkLoadCompleteForThisFrame()
 {
     ASSERT(client()->hasWebView());
     RefPtr<LocalFrame> protect(m_frame);
 
     bool allChildrenAreDoneLoading = true;
     for (RefPtr<Frame> child = m_frame->tree().firstChild(); child; child = child->tree().nextSibling()) {
         if (child->isLocalFrame())
             allChildrenAreDoneLoading &= toLocalFrame(child.get())->loader().checkLoadCompleteForThisFrame();
@@ skipping 15 matching lines @@
         return true;
     }
 
     if (!allChildrenAreDoneLoading)
         return false;
 
     if (m_state == FrameStateComplete)
         return true;
     if (m_provisionalDocumentLoader || !m_documentLoader)
         return false;
+
+#if defined(ENABLE_LOAD_COMPLETION_HACKS)
     if (!isDocumentDoneLoading(m_frame->document()) && !m_inStopAllLoaders)
         return false;
+#else
+    if (m_inStopAllLoaders)
+        m_frame->document()->suppressLoadEvent();
+    if (!m_frame->document()->loadEventFinished())
+        return false;
+#endif
 
     m_state = FrameStateComplete;
 
     // FIXME: Is this subsequent work important if we already navigated away?
     // Maybe there are bugs because of that, or extra work we can skip because
     // the new page is ready.
 
     // Retry restoring scroll offset since FrameStateComplete disables content
     // size clamping.
     restoreScrollPositionAndViewState();
@@ skipping 283 matching lines @@
 
     bool isTransitionNavigation = false;
     if (RuntimeEnabledFeatures::navigationTransitionsEnabled() && type != FrameLoadTypeReload && type != FrameLoadTypeReloadFromOrigin && type != FrameLoadTypeSame)
         isTransitionNavigation = dispatchNavigationTransitionData();
 
     // stopAllLoaders can detach the LocalFrame, so protect it.
     RefPtr<LocalFrame> protect(m_frame);
     if ((!m_policyDocumentLoader->shouldContinueForNavigationPolicy(request, shouldCheckMainWorldContentSecurityPolicy, isTransitionNavigation) || !shouldClose()) && m_policyDocumentLoader) {
         m_policyDocumentLoader->detachFromFrame();
         m_policyDocumentLoader = nullptr;
+        if (!m_stateMachine.committedFirstRealDocumentLoad())
+            m_state = FrameStateComplete;

[Nate Chapin, 2014/09/15 23:39:35]

This isn't necessary in the real world at the moment (and may not be necessary
even in an OOPI world). It only really matters if
shouldContinueForNavigationPolicy() asks us to ignore the first real load in an
iframe, which is covered by a layout test.

         checkCompleted();
         return;
     }
 
     if (m_provisionalDocumentLoader) {
         m_provisionalDocumentLoader->stopLoading();
         if (m_provisionalDocumentLoader)
             m_provisionalDocumentLoader->detachFromFrame();
         m_provisionalDocumentLoader = nullptr;
     }
@@ skipping 156 matching lines @@
     // FIXME: We need a way to propagate sandbox flags to out-of-process frames.
     Frame* parentFrame = m_frame->tree().parent();
     if (parentFrame && parentFrame->isLocalFrame())
         flags |= toLocalFrame(parentFrame)->document()->sandboxFlags();
     if (FrameOwner* frameOwner = m_frame->owner())
         flags |= frameOwner->sandboxFlags();
     return flags;
 }
 
 } // namespace blink