Add an empty boolean to WebFrameClient::didFinishDocumentLoad

Source/core/loader/DocumentLoader.h

 /*
  * Copyright (C) 2006, 2007, 2008, 2009 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 76 matching lines @@
         const SubstituteData& substituteData() const { return m_substituteData; }
 
         const KURL& url() const;
         const KURL& unreachableURL() const;
         const KURL& urlForHistory() const;
 
         const AtomicString& responseMIMEType() const;
 
         void updateForSameDocumentNavigation(const KURL&, SameDocumentNavigationSource);
         void stopLoading();
-        bool isCommitted() const { return m_committed; }
         bool isLoading() const;
-        bool isLoadingMainResource() const { return m_loadingMainResource; }
         const ResourceResponse& response() const { return m_response; }
         const ResourceError& mainDocumentError() const { return m_mainDocumentError; }
         bool isClientRedirect() const { return m_isClientRedirect; }
         void setIsClientRedirect(bool isClientRedirect) { m_isClientRedirect = isClientRedirect; }
         bool replacesCurrentHistoryItem() const { return m_replacesCurrentHistoryItem; }
         void setReplacesCurrentHistoryItem(bool replacesCurrentHistoryItem) { m_replacesCurrentHistoryItem = replacesCurrentHistoryItem; }
 
+        bool isCommittedButEmpty() const { return m_state == Committed; }

[dcheng, 2015/07/13 20:53:56]

Does this imply that mainReceivedError/finishedLoading aren't called in this
case?

[Nate Chapin, 2015/07/13 21:13:28]

The most common case would be that this is called when finishedLoading() is on
the stack but not finished, inside finishedLoading()'s endWriting() call.

+
         bool shouldContinueForNavigationPolicy(const ResourceRequest&, ContentSecurityPolicyDisposition shouldCheckMainWorldContentSecurityPolicy, NavigationPolicy = NavigationPolicyCurrentTab);
         NavigationType navigationType() const { return m_navigationType; }
         void setNavigationType(NavigationType navigationType) { m_navigationType = navigationType; }
 
         void setDefersLoading(bool);
 
         void startLoadingMainResource();
         void cancelMainResourceLoad(const ResourceError&);
 
         void attachThreadedDataReceiver(PassRefPtrWillBeRawPtr<ThreadedDataReceiver>);
@@ skipping 37 matching lines @@
         static PassRefPtrWillBeRawPtr<DocumentWriter> createWriterFor(const Document* ownerDocument, const DocumentInit&, const AtomicString& mimeType, const AtomicString& encoding, bool dispatch, ParserSynchronizationPolicy);
 
         void ensureWriter(const AtomicString& mimeType, const KURL& overridingURL = KURL());
         void endWriting(DocumentWriter*);
 
         Document* document() const;
         FrameLoader* frameLoader() const;
 
         void commitIfReady();
         void commitData(const char* bytes, size_t length);
-        void clearMainResourceLoader();
         ResourceLoader* mainResourceLoader() const;
         void clearMainResourceHandle();
 
         bool maybeCreateArchive();
 
         void prepareSubframeArchiveLoadIfNeeded();
 
         void willSendRequest(ResourceRequest&, const ResourceResponse&);
         void finishedLoading(double finishTime);
         void mainReceivedError(const ResourceError&);
@@ skipping 26 matching lines @@
 
         // The 'working' request. It may be mutated
         // several times from the original request to include additional
         // headers, cookie information, canonicalization and redirects.
         ResourceRequest m_request;
 
         ResourceResponse m_response;
 
         ResourceError m_mainDocumentError;
 
-        bool m_committed;
         bool m_isClientRedirect;
         bool m_replacesCurrentHistoryItem;
 
         NavigationType m_navigationType;
 
         RefPtrWillBeMember<MHTMLArchive> m_archive;
 
-        bool m_loadingMainResource;
         DocumentLoadTiming m_documentLoadTiming;
 
         double m_timeOfLastDataReceived;
 
         PersistentWillBeMember<ApplicationCacheHost> m_applicationCacheHost;
 
         RefPtr<ContentSecurityPolicy> m_contentSecurityPolicy;
         ClientHintsPreferences m_clientHintsPreferences;
         InitialScrollState m_initialScrollState;
+
+        enum State {
+            NotStarted,
+            Provisional,
+            Committed,
+            DataReceived,
+            MainResourceDone
+        };
+        State m_state;
     };
 
     DECLARE_WEAK_IDENTIFIER_MAP(DocumentLoader);
 
 } // namespace blink
 
 #endif // DocumentLoader_h