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

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

Issue 2748463002: Split header modification out of willSendRequest
Patch Set: bug fix Created 3 years, 9 months 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 void addAdditionalRequestHeaders(ResourceRequest&, 75 void addAdditionalRequestHeaders(ResourceRequest&,
76 FetchResourceType) override; 76 FetchResourceType) override;
77 CachePolicy getCachePolicy() const override; 77 CachePolicy getCachePolicy() const override;
78 WebCachePolicy resourceRequestCachePolicy( 78 WebCachePolicy resourceRequestCachePolicy(
79 ResourceRequest&, 79 ResourceRequest&,
80 Resource::Type, 80 Resource::Type,
81 FetchRequest::DeferOption) const override; 81 FetchRequest::DeferOption) const override;
82 void dispatchDidChangeResourcePriority(unsigned long identifier, 82 void dispatchDidChangeResourcePriority(unsigned long identifier,
83 ResourceLoadPriority, 83 ResourceLoadPriority,
84 int intraPriorityValue) override; 84 int intraPriorityValue) override;
85 void dispatchWillSendRequest( 85 void prepareRequest(unsigned long identifier, ResourceRequest&) override;
86 unsigned long identifier, 86 void dispatchWillSendRequest(unsigned long identifier,
87 ResourceRequest&, 87 const ResourceRequest&,
88 const ResourceResponse& redirectResponse, 88 const ResourceResponse& redirectResponse,
89 const FetchInitiatorInfo& = FetchInitiatorInfo()) override; 89 const FetchInitiatorInfo&) override;
90 void dispatchDidLoadResourceFromMemoryCache( 90 void dispatchDidLoadResourceFromMemoryCache(
91 unsigned long identifier, 91 unsigned long identifier,
92 Resource*, 92 Resource*,
93 WebURLRequest::FrameType, 93 WebURLRequest::FrameType,
94 WebURLRequest::RequestContext) override; 94 WebURLRequest::RequestContext) override;
95 void dispatchDidReceiveResponse(unsigned long identifier, 95 void dispatchDidReceiveResponse(unsigned long identifier,
96 const ResourceResponse&, 96 const ResourceResponse&,
97 WebURLRequest::FrameType, 97 WebURLRequest::FrameType,
98 WebURLRequest::RequestContext, 98 WebURLRequest::RequestContext,
99 Resource*) override; 99 Resource*) override;
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 void printAccessDeniedMessage(const KURL&) const; 188 void printAccessDeniedMessage(const KURL&) const;
189 ResourceRequestBlockedReason canRequestInternal( 189 ResourceRequestBlockedReason canRequestInternal(
190 Resource::Type, 190 Resource::Type,
191 const ResourceRequest&, 191 const ResourceRequest&,
192 const KURL&, 192 const KURL&,
193 const ResourceLoaderOptions&, 193 const ResourceLoaderOptions&,
194 SecurityViolationReportingPolicy, 194 SecurityViolationReportingPolicy,
195 FetchRequest::OriginRestriction, 195 FetchRequest::OriginRestriction,
196 ResourceRequest::RedirectStatus) const; 196 ResourceRequest::RedirectStatus) const;
197 197
198 void prepareRequest(ResourceRequest&);
199
200 void dispatchDidReceiveResponseInternal(unsigned long identifier, 198 void dispatchDidReceiveResponseInternal(unsigned long identifier,
201 const ResourceResponse&, 199 const ResourceResponse&,
202 WebURLRequest::FrameType, 200 WebURLRequest::FrameType,
203 WebURLRequest::RequestContext, 201 WebURLRequest::RequestContext,
204 Resource*, 202 Resource*,
205 LinkLoader::CanLoadResources); 203 LinkLoader::CanLoadResources);
206 204
207 void addCSPHeaderIfNecessary(Resource::Type, ResourceRequest&); 205 void addCSPHeaderIfNecessary(Resource::Type, ResourceRequest&);
208 206
209 // FIXME: Oilpan: Ideally this should just be a traced Member but that will 207 // FIXME: Oilpan: Ideally this should just be a traced Member but that will
210 // currently leak because ComputedStyle and its data are not on the heap. 208 // currently leak because ComputedStyle and its data are not on the heap.
211 // See crbug.com/383860 for details. 209 // See crbug.com/383860 for details.
212 WeakMember<Document> m_document; 210 WeakMember<Document> m_document;
213 Member<DocumentLoader> m_documentLoader; 211 Member<DocumentLoader> m_documentLoader;
214 }; 212 };
215 213
216 } // namespace blink 214 } // namespace blink
217 215
218 #endif 216 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698