BASELINE: Update Chromium to 58.0.3029.54

Change-Id: I67f57065a7afdc8e4614adb5c0230281428df4d1
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>

1 files changed, 17 insertions, 12 deletions

diff --git a/chromium/third_party/WebKit/Source/core/loader/DocumentLoader.h b/chromium/third_party/WebKit/Source/core/loader/DocumentLoader.h
index 1117913c3c0..bc1e5d3ff5c 100644
--- a/chromium/third_party/WebKit/Source/core/loader/DocumentLoader.h
+++ b/chromium/third_party/WebKit/Source/core/loader/DocumentLoader.h
@@ -33,10 +33,6 @@
 #include "core/CoreExport.h"
 #include "core/dom/ViewportDescription.h"
 #include "core/dom/WeakIdentifierMap.h"
-#include "core/fetch/ClientHintsPreferences.h"
-#include "core/fetch/RawResource.h"
-#include "core/fetch/ResourceLoaderOptions.h"
-#include "core/fetch/SubstituteData.h"
 #include "core/frame/FrameTypes.h"
 #include "core/frame/csp/ContentSecurityPolicy.h"
 #include "core/loader/DocumentLoadTiming.h"
@@ -45,24 +41,29 @@
 #include "core/loader/LinkLoader.h"
 #include "core/loader/NavigationPolicy.h"
 #include "platform/SharedBuffer.h"
+#include "platform/loader/fetch/ClientHintsPreferences.h"
+#include "platform/loader/fetch/RawResource.h"
+#include "platform/loader/fetch/ResourceLoaderOptions.h"
+#include "platform/loader/fetch/SubstituteData.h"
 #include "platform/network/ResourceError.h"
 #include "platform/network/ResourceRequest.h"
 #include "platform/network/ResourceResponse.h"
 #include "public/platform/WebLoadingBehaviorFlag.h"
 #include "wtf/HashSet.h"
 #include "wtf/RefPtr.h"
+
 #include <memory>
 
 namespace blink {
 
 class ApplicationCacheHost;
+class SubresourceFilter;
 class ResourceFetcher;
 class DocumentInit;
 class LocalFrame;
+class LocalFrameClient;
 class FrameLoader;
-class FrameLoaderClient;
 class ResourceTimingInfo;
-class WebDocumentSubresourceFilter;
 struct ViewportDescriptionWrapper;
 
 class CORE_EXPORT DocumentLoader
@@ -100,8 +101,8 @@ class CORE_EXPORT DocumentLoader
 
   ResourceFetcher* fetcher() const { return m_fetcher.get(); }
 
-  void setSubresourceFilter(std::unique_ptr<WebDocumentSubresourceFilter>);
-  WebDocumentSubresourceFilter* subresourceFilter() const {
+  void setSubresourceFilter(SubresourceFilter*);
+  SubresourceFilter* subresourceFilter() const {
     return m_subresourceFilter.get();
   }
 
@@ -136,6 +137,9 @@ class CORE_EXPORT DocumentLoader
   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;
@@ -187,8 +191,6 @@ class CORE_EXPORT DocumentLoader
                  const SubstituteData&,
                  ClientRedirectPolicy);
 
-  void didRedirect(const KURL& oldURL, const KURL& newURL);
-
   Vector<KURL> m_redirectChain;
 
  private:
@@ -206,7 +208,7 @@ class CORE_EXPORT DocumentLoader
   // Use these method only where it's guaranteed that |m_frame| hasn't been
   // cleared.
   FrameLoader& frameLoader() const;
-  FrameLoaderClient& frameLoaderClient() const;
+  LocalFrameClient& localFrameClient() const;
 
   void commitIfReady();
   void commitData(const char* bytes, size_t length);
@@ -240,12 +242,13 @@ class CORE_EXPORT DocumentLoader
 
   Member<LocalFrame> m_frame;
   Member<ResourceFetcher> m_fetcher;
-  std::unique_ptr<WebDocumentSubresourceFilter> m_subresourceFilter;
 
   Member<RawResource> m_mainResource;
 
   Member<DocumentWriter> m_writer;
 
+  Member<SubresourceFilter> m_subresourceFilter;
+
   // A reference to actual request used to create the data source.
   // The only part of this request that should change is the url, and
   // that only in the case of a same-document navigation.
@@ -260,6 +263,8 @@ class CORE_EXPORT DocumentLoader
 
   ResourceResponse m_response;
 
+  FrameLoadType m_loadType;
+
   bool m_isClientRedirect;
   bool m_replacesCurrentHistoryItem;
   bool m_dataReceived;