Move loadType() to DocumentLoader

third_party/WebKit/Source/core/loader/DocumentLoader.cpp

 /*
  * Copyright (C) 2006, 2007, 2008 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 87 matching lines @@
 
 DocumentLoader::DocumentLoader(LocalFrame* frame,
                                const ResourceRequest& req,
                                const SubstituteData& substituteData,
                                ClientRedirectPolicy clientRedirectPolicy)
     : m_frame(frame),
       m_fetcher(FrameFetchContext::createFetcherFromDocumentLoader(this)),
       m_originalRequest(req),
       m_substituteData(substituteData),
       m_request(req),
+      m_loadType(FrameLoadTypeStandard),
       m_isClientRedirect(clientRedirectPolicy ==
                          ClientRedirectPolicy::ClientRedirect),
       m_replacesCurrentHistoryItem(false),
       m_dataReceived(false),
       m_navigationType(NavigationTypeOther),
       m_documentLoadTiming(*this),
       m_timeOfLastDataReceived(0.0),
       m_applicationCacheHost(ApplicationCacheHost::create(this)),
       m_wasBlockedAfterCSP(false),
       m_state(NotStarted),
@@ skipping 250 matching lines @@
   const KURL& requestURL = m_request.url();
   RefPtr<SecurityOrigin> redirectingOrigin =
       SecurityOrigin::create(redirectResponse.url());
   if (!redirectingOrigin->canDisplay(requestURL)) {
     FrameLoader::reportLocalLoadFailed(m_frame, requestURL.getString());
     m_fetcher->stopFetching();
     return false;
   }
   if (!frameLoader().shouldContinueForNavigationPolicy(
           m_request, SubstituteData(), this, CheckContentSecurityPolicy,
-          m_navigationType, NavigationPolicyCurrentTab,
-          replacesCurrentHistoryItem(), isClientRedirect(), nullptr)) {
+          m_navigationType, NavigationPolicyCurrentTab, m_loadType,
+          isClientRedirect(), nullptr)) {
     m_fetcher->stopFetching();
     return false;
   }
 
   DCHECK(timing().fetchStart());
   appendRedirect(requestURL);
   didRedirect(redirectResponse.url(), requestURL);
   frameLoaderClient().dispatchDidReceiveServerRedirectForProvisionalLoad();
 
   return true;
@@ skipping 423 matching lines @@
                              m_writer ? m_writer->encoding() : emptyAtom, true,
                              ForceSynchronousParsing);
   if (!source.isNull())
     m_writer->appendReplacingData(source);
   endWriting();
 }
 
 DEFINE_WEAK_IDENTIFIER_MAP(DocumentLoader);
 
 }  // namespace blink