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

Side by Side Diff: Source/core/fetch/ResourceFetcher.h

Issue 398313002: Teach ContentSecurityPolicy about WebURLRequest::RequestContext. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: UseCounter Created 6 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/fetch/CachingCorrectnessTest.cpp ('k') | Source/core/fetch/ResourceFetcher.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) 1998 Lars Knoll (knoll@mpi-hd.mpg.de) 2 Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de)
3 Copyright (C) 2001 Dirk Mueller <mueller@kde.org> 3 Copyright (C) 2001 Dirk Mueller <mueller@kde.org>
4 Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. 4 Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
5 Copyright (C) 2009 Torch Mobile Inc. http://www.torchmobile.com/ 5 Copyright (C) 2009 Torch Mobile Inc. http://www.torchmobile.com/
6 6
7 This library is free software; you can redistribute it and/or 7 This library is free software; you can redistribute it and/or
8 modify it under the terms of the GNU Library General Public 8 modify it under the terms of the GNU Library General Public
9 License as published by the Free Software Foundation; either 9 License as published by the Free Software Foundation; either
10 version 2 of the License, or (at your option) any later version. 10 version 2 of the License, or (at your option) any later version.
(...skipping 16 matching lines...) Expand all
27 #define ResourceFetcher_h 27 #define ResourceFetcher_h
28 28
29 #include "core/fetch/CachePolicy.h" 29 #include "core/fetch/CachePolicy.h"
30 #include "core/fetch/FetchInitiatorInfo.h" 30 #include "core/fetch/FetchInitiatorInfo.h"
31 #include "core/fetch/FetchRequest.h" 31 #include "core/fetch/FetchRequest.h"
32 #include "core/fetch/Resource.h" 32 #include "core/fetch/Resource.h"
33 #include "core/fetch/ResourceLoaderHost.h" 33 #include "core/fetch/ResourceLoaderHost.h"
34 #include "core/fetch/ResourceLoaderOptions.h" 34 #include "core/fetch/ResourceLoaderOptions.h"
35 #include "core/fetch/ResourcePtr.h" 35 #include "core/fetch/ResourcePtr.h"
36 #include "platform/Timer.h" 36 #include "platform/Timer.h"
37 #include "public/platform/WebURLRequest.h"
37 #include "wtf/Deque.h" 38 #include "wtf/Deque.h"
38 #include "wtf/HashMap.h" 39 #include "wtf/HashMap.h"
39 #include "wtf/HashSet.h" 40 #include "wtf/HashSet.h"
40 #include "wtf/ListHashSet.h" 41 #include "wtf/ListHashSet.h"
41 #include "wtf/text/StringHash.h" 42 #include "wtf/text/StringHash.h"
42 43
43 namespace blink { 44 namespace blink {
44 45
45 class CSSStyleSheetResource; 46 class CSSStyleSheetResource;
46 class DocumentResource; 47 class DocumentResource;
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 void storeResourceTimingInitiatorInformation(Resource*); 182 void storeResourceTimingInitiatorInformation(Resource*);
182 void requestPreload(Resource::Type, FetchRequest&, const String& charset); 183 void requestPreload(Resource::Type, FetchRequest&, const String& charset);
183 184
184 enum RevalidationPolicy { Use, Revalidate, Reload, Load }; 185 enum RevalidationPolicy { Use, Revalidate, Reload, Load };
185 RevalidationPolicy determineRevalidationPolicy(Resource::Type, const FetchRe quest&, Resource* existingResource) const; 186 RevalidationPolicy determineRevalidationPolicy(Resource::Type, const FetchRe quest&, Resource* existingResource) const;
186 187
187 void determineRequestContext(ResourceRequest&, Resource::Type); 188 void determineRequestContext(ResourceRequest&, Resource::Type);
188 ResourceRequestCachePolicy resourceRequestCachePolicy(const ResourceRequest& , Resource::Type); 189 ResourceRequestCachePolicy resourceRequestCachePolicy(const ResourceRequest& , Resource::Type);
189 void addAdditionalRequestHeaders(ResourceRequest&, Resource::Type); 190 void addAdditionalRequestHeaders(ResourceRequest&, Resource::Type);
190 191
191 bool canRequest(Resource::Type, const KURL&, const ResourceLoaderOptions&, b ool forPreload, FetchRequest::OriginRestriction) const; 192 bool canRequest(Resource::Type, blink::WebURLRequest::RequestContext, const KURL&, const ResourceLoaderOptions&, bool forPreload, FetchRequest::OriginRestri ction) const;
192 bool checkInsecureContent(Resource::Type, const KURL&, MixedContentBlockingT reatment) const; 193 bool checkInsecureContent(Resource::Type, const KURL&, MixedContentBlockingT reatment) const;
193 194
194 static bool resourceNeedsLoad(Resource*, const FetchRequest&, RevalidationPo licy); 195 static bool resourceNeedsLoad(Resource*, const FetchRequest&, RevalidationPo licy);
195 196
196 void notifyLoadedFromMemoryCache(Resource*); 197 void notifyLoadedFromMemoryCache(Resource*);
197 198
198 void garbageCollectDocumentResourcesTimerFired(Timer<ResourceFetcher>*); 199 void garbageCollectDocumentResourcesTimerFired(Timer<ResourceFetcher>*);
199 void scheduleDocumentResourcesGC(); 200 void scheduleDocumentResourcesGC();
200 201
201 void resourceTimingReportTimerFired(Timer<ResourceFetcher>*); 202 void resourceTimingReportTimerFired(Timer<ResourceFetcher>*);
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
266 m_loader->m_allowStaleResources = m_previousState; 267 m_loader->m_allowStaleResources = m_previousState;
267 } 268 }
268 private: 269 private:
269 ResourceFetcher* m_loader; 270 ResourceFetcher* m_loader;
270 bool m_previousState; 271 bool m_previousState;
271 }; 272 };
272 273
273 } // namespace blink 274 } // namespace blink
274 275
275 #endif 276 #endif
OLDNEW
« no previous file with comments | « Source/core/fetch/CachingCorrectnessTest.cpp ('k') | Source/core/fetch/ResourceFetcher.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698