Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(205)

Side by Side Diff: third_party/WebKit/Source/core/loader/DocumentLoader.h

Issue 2461043003: Fix for the RedirectTest.ClientServerServer test. (Closed)
Patch Set: More build error fixes Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/loader/DocumentLoader.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
3 * Copyright (C) 2011 Google Inc. All rights reserved. 3 * Copyright (C) 2011 Google Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 8 *
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 19 matching lines...) Expand all
30 #ifndef DocumentLoader_h 30 #ifndef DocumentLoader_h
31 #define DocumentLoader_h 31 #define DocumentLoader_h
32 32
33 #include "core/CoreExport.h" 33 #include "core/CoreExport.h"
34 #include "core/dom/ViewportDescription.h" 34 #include "core/dom/ViewportDescription.h"
35 #include "core/dom/WeakIdentifierMap.h" 35 #include "core/dom/WeakIdentifierMap.h"
36 #include "core/fetch/ClientHintsPreferences.h" 36 #include "core/fetch/ClientHintsPreferences.h"
37 #include "core/fetch/RawResource.h" 37 #include "core/fetch/RawResource.h"
38 #include "core/fetch/ResourceLoaderOptions.h" 38 #include "core/fetch/ResourceLoaderOptions.h"
39 #include "core/fetch/SubstituteData.h" 39 #include "core/fetch/SubstituteData.h"
40 #include "core/frame/FrameTypes.h"
40 #include "core/frame/csp/ContentSecurityPolicy.h" 41 #include "core/frame/csp/ContentSecurityPolicy.h"
41 #include "core/loader/DocumentLoadTiming.h" 42 #include "core/loader/DocumentLoadTiming.h"
42 #include "core/loader/DocumentWriter.h" 43 #include "core/loader/DocumentWriter.h"
43 #include "core/loader/FrameLoaderTypes.h" 44 #include "core/loader/FrameLoaderTypes.h"
44 #include "core/loader/LinkLoader.h" 45 #include "core/loader/LinkLoader.h"
45 #include "core/loader/NavigationPolicy.h" 46 #include "core/loader/NavigationPolicy.h"
46 #include "platform/SharedBuffer.h" 47 #include "platform/SharedBuffer.h"
47 #include "platform/network/ResourceError.h" 48 #include "platform/network/ResourceError.h"
48 #include "platform/network/ResourceRequest.h" 49 #include "platform/network/ResourceRequest.h"
49 #include "platform/network/ResourceResponse.h" 50 #include "platform/network/ResourceResponse.h"
(...skipping 13 matching lines...) Expand all
63 struct ViewportDescriptionWrapper; 64 struct ViewportDescriptionWrapper;
64 65
65 class CORE_EXPORT DocumentLoader 66 class CORE_EXPORT DocumentLoader
66 : public GarbageCollectedFinalized<DocumentLoader>, 67 : public GarbageCollectedFinalized<DocumentLoader>,
67 private RawResourceClient { 68 private RawResourceClient {
68 USING_GARBAGE_COLLECTED_MIXIN(DocumentLoader); 69 USING_GARBAGE_COLLECTED_MIXIN(DocumentLoader);
69 70
70 public: 71 public:
71 static DocumentLoader* create(LocalFrame* frame, 72 static DocumentLoader* create(LocalFrame* frame,
72 const ResourceRequest& request, 73 const ResourceRequest& request,
73 const SubstituteData& data) { 74 const SubstituteData& data,
74 return new DocumentLoader(frame, request, data); 75 ClientRedirectPolicy clientRedirectPolicy) {
76 return new DocumentLoader(frame, request, data, clientRedirectPolicy);
75 } 77 }
76 ~DocumentLoader() override; 78 ~DocumentLoader() override;
77 79
78 LocalFrame* frame() const { return m_frame; } 80 LocalFrame* frame() const { return m_frame; }
79 81
80 virtual void detachFromFrame(); 82 virtual void detachFromFrame();
81 83
82 unsigned long mainResourceIdentifier() const; 84 unsigned long mainResourceIdentifier() const;
83 85
84 void replaceDocumentWhileExecutingJavaScriptURL(const DocumentInit&, 86 void replaceDocumentWhileExecutingJavaScriptURL(const DocumentInit&,
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
176 } 178 }
177 179
178 void dispatchLinkHeaderPreloads(ViewportDescriptionWrapper*, 180 void dispatchLinkHeaderPreloads(ViewportDescriptionWrapper*,
179 LinkLoader::MediaPreloadPolicy); 181 LinkLoader::MediaPreloadPolicy);
180 182
181 Resource* startPreload(Resource::Type, FetchRequest&); 183 Resource* startPreload(Resource::Type, FetchRequest&);
182 184
183 DECLARE_VIRTUAL_TRACE(); 185 DECLARE_VIRTUAL_TRACE();
184 186
185 protected: 187 protected:
186 DocumentLoader(LocalFrame*, const ResourceRequest&, const SubstituteData&); 188 DocumentLoader(LocalFrame*,
189 const ResourceRequest&,
190 const SubstituteData&,
191 ClientRedirectPolicy);
187 192
188 void didRedirect(const KURL& oldURL, const KURL& newURL); 193 void didRedirect(const KURL& oldURL, const KURL& newURL);
189 194
190 Vector<KURL> m_redirectChain; 195 Vector<KURL> m_redirectChain;
191 196
192 private: 197 private:
193 static DocumentWriter* createWriterFor(const DocumentInit&, 198 static DocumentWriter* createWriterFor(const DocumentInit&,
194 const AtomicString& mimeType, 199 const AtomicString& mimeType,
195 const AtomicString& encoding, 200 const AtomicString& encoding,
196 bool dispatchWindowObjectAvailable, 201 bool dispatchWindowObjectAvailable,
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
280 // Used to protect against reentrancy into dataReceived(). 285 // Used to protect against reentrancy into dataReceived().
281 bool m_inDataReceived; 286 bool m_inDataReceived;
282 RefPtr<SharedBuffer> m_dataBuffer; 287 RefPtr<SharedBuffer> m_dataBuffer;
283 }; 288 };
284 289
285 DECLARE_WEAK_IDENTIFIER_MAP(DocumentLoader); 290 DECLARE_WEAK_IDENTIFIER_MAP(DocumentLoader);
286 291
287 } // namespace blink 292 } // namespace blink
288 293
289 #endif // DocumentLoader_h 294 #endif // DocumentLoader_h
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/loader/DocumentLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698