Move loadType() to DocumentLoader

third_party/WebKit/Source/core/loader/FrameLoader.h

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
  * (http://www.torchmobile.com/)
  * Copyright (C) Research In Motion Limited 2009. 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:
@@ skipping 111 matching lines @@
     return m_provisionalDocumentLoader.get();
   }
 
   void loadFailed(DocumentLoader*, const ResourceError&);
 
   bool isLoadingMainFrame() const;
 
   bool shouldTreatURLAsSameAsCurrent(const KURL&) const;
   bool shouldTreatURLAsSrcdocDocument(const KURL&) const;
 
-  FrameLoadType loadType() const;
-  void setLoadType(FrameLoadType loadType) { m_loadType = loadType; }
-
   FrameLoaderClient* client() const;
 
   void setDefersLoading(bool);
 
   void didExplicitOpen();
 
   // Callbacks from DocumentWriter
   void didInstallNewDocument(bool dispatchWindowObjectAvailable);
 
   void didBeginDocument();
@@ skipping 58 matching lines @@
   void saveScrollState();
 
   void restoreScrollPositionAndViewState();
 
   bool shouldContinueForNavigationPolicy(const ResourceRequest&,
                                          const SubstituteData&,
                                          DocumentLoader*,
                                          ContentSecurityPolicyDisposition,
                                          NavigationType,
                                          NavigationPolicy,
-                                         bool shouldReplaceCurrentEntry,
+                                         FrameLoadType,
                                          bool isClientRedirect,
                                          HTMLFormElement*);
 
   // PlzNavigate: Navigations handled by the client are treated as
   // provisional navigations.
   bool hasProvisionalNavigation() const {
     return provisionalDocumentLoader() || m_isNavigationHandledByClient;
   }
 
   DECLARE_TRACE();
 
   static void setReferrerForFrameRequest(FrameLoadRequest&);
 
  private:
   void checkTimerFired(TimerBase*);
 
   bool prepareRequestForThisFrame(FrameLoadRequest&);
   FrameLoadType determineFrameLoadType(const FrameLoadRequest&);
 
   SubstituteData defaultSubstituteDataForURL(const KURL&);
 
   bool shouldPerformFragmentNavigation(bool isFormSubmission,
                                        const String& httpMethod,
                                        FrameLoadType,
                                        const KURL&);
-  void processFragment(const KURL&, LoadStartType);
+  void processFragment(const KURL&, FrameLoadType, LoadStartType);
 
   void startLoad(FrameLoadRequest&, FrameLoadType, NavigationPolicy);
 
   enum class HistoryNavigationType { DifferentDocument, Fragment, HistoryApi };
   void setHistoryItemStateForCommit(FrameLoadType,
                                     HistoryCommitType,
                                     HistoryNavigationType);
 
   void loadInSameDocument(const KURL&,
                           PassRefPtr<SerializedScriptValue> stateObject,
                           FrameLoadType,
                           HistoryLoadType,
                           ClientRedirectPolicy,
                           Document*);
+  void restoreScrollPositionAndViewStateForLoadType(FrameLoadType);
 
   void scheduleCheckCompleted();
 
   void detachDocumentLoader(Member<DocumentLoader>&);
 
   void upgradeInsecureRequest(ResourceRequest&, Document*) const;
 
   std::unique_ptr<TracedValue> toTracedValue() const;
   void takeObjectSnapshot() const;
 
   Member<LocalFrame> m_frame;
   AtomicString m_requiredCSP;
 
   // FIXME: These should be std::unique_ptr<T> to reduce build times and
   // simplify header dependencies unless performance testing proves otherwise.
   // Some of these could be lazily created for memory savings on devices.
   mutable FrameLoaderStateMachine m_stateMachine;
 
   Member<ProgressTracker> m_progressTracker;
 
-  FrameLoadType m_loadType;
-
   // Document loaders for the three phases of frame loading. Note that while a
   // new request is being loaded, the old document loader may still be
   // referenced. E.g. while a new request is in the "policy" state, the old
   // document loader may be consulted in particular as it makes sense to imply
   // certain settings on the new loader.
   Member<DocumentLoader> m_documentLoader;
   Member<DocumentLoader> m_provisionalDocumentLoader;
 
   Member<HistoryItem> m_currentItem;
   Member<HistoryItem> m_provisionalItem;
@@ skipping 36 matching lines @@
   SandboxFlags m_forcedSandboxFlags;
 
   bool m_dispatchingDidClearWindowObjectInMainWorld;
   bool m_protectProvisionalLoader;
   bool m_isNavigationHandledByClient;
 };
 
 }  // namespace blink
 
 #endif  // FrameLoader_h