Move loadType() to DocumentLoader

third_party/WebKit/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 107 matching lines @@
   void updateForSameDocumentNavigation(const KURL&,
                                        SameDocumentNavigationSource);
   const ResourceResponse& response() const { return m_response; }
   bool isClientRedirect() const { return m_isClientRedirect; }
   void setIsClientRedirect(bool isClientRedirect) {
     m_isClientRedirect = isClientRedirect;
   }
   bool replacesCurrentHistoryItem() const {
     return m_replacesCurrentHistoryItem;
   }
   void setReplacesCurrentHistoryItem(bool replacesCurrentHistoryItem) {

[yhirano, 2017/01/27 08:34:12]

Is it possible to remove this function by computing replacesCurrentHistoryItem()
directly from loadType()? If so, maybe moving replacesCurrentHistoryItem() to
WebDataSource is good, too.

[Nate Chapin, 2017/01/27 17:57:55]

Yes, removing m_replacesCurrentHistoryItem and using loadType() directly is on
my followups.

     m_replacesCurrentHistoryItem = replacesCurrentHistoryItem;
   }
 
   bool isCommittedButEmpty() const {
     return m_state >= Committed && !m_dataReceived;
   }
 
   void setSentDidFinishLoad() { m_state = SentDidFinishLoad; }
   bool sentDidFinishLoad() const { return m_state == SentDidFinishLoad; }
 
+  FrameLoadType loadType() const { return m_loadType; }
+  void setLoadType(FrameLoadType loadType) { m_loadType = loadType; }
+
   NavigationType getNavigationType() const { return m_navigationType; }
   void setNavigationType(NavigationType navigationType) {
     m_navigationType = navigationType;
   }
 
   void startLoadingMainResource();
 
   DocumentLoadTiming& timing() { return m_documentLoadTiming; }
   const DocumentLoadTiming& timing() const { return m_documentLoadTiming; }
 
@@ skipping 104 matching lines @@
 
   SubstituteData m_substituteData;
 
   // 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;
 
+  FrameLoadType m_loadType;
+
   bool m_isClientRedirect;
   bool m_replacesCurrentHistoryItem;
   bool m_dataReceived;
 
   NavigationType m_navigationType;
 
   DocumentLoadTiming m_documentLoadTiming;
 
   double m_timeOfLastDataReceived;
 
@@ skipping 16 matching lines @@
   // Used to protect against reentrancy into dataReceived().
   bool m_inDataReceived;
   RefPtr<SharedBuffer> m_dataBuffer;
 };
 
 DECLARE_WEAK_IDENTIFIER_MAP(DocumentLoader);
 
 }  // namespace blink
 
 #endif  // DocumentLoader_h