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

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

Issue 901903003: CSP: Adding the 'upgrade-insecure-requests' directive. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rearranging. Created 5 years, 10 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) 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 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 void preCacheDataURIImage(const FetchRequest&); 181 void preCacheDataURIImage(const FetchRequest&);
182 void preCacheSubstituteDataForMainResource(const FetchRequest&, const Substi tuteData&); 182 void preCacheSubstituteDataForMainResource(const FetchRequest&, const Substi tuteData&);
183 void storeResourceTimingInitiatorInformation(Resource*); 183 void storeResourceTimingInitiatorInformation(Resource*);
184 184
185 enum RevalidationPolicy { Use, Revalidate, Reload, Load }; 185 enum RevalidationPolicy { Use, Revalidate, Reload, Load };
186 RevalidationPolicy determineRevalidationPolicy(Resource::Type, const FetchRe quest&, Resource* existingResource) const; 186 RevalidationPolicy determineRevalidationPolicy(Resource::Type, const FetchRe quest&, Resource* existingResource) const;
187 187
188 void determineRequestContext(ResourceRequest&, Resource::Type); 188 void determineRequestContext(ResourceRequest&, Resource::Type);
189 ResourceRequestCachePolicy resourceRequestCachePolicy(const ResourceRequest& , Resource::Type); 189 ResourceRequestCachePolicy resourceRequestCachePolicy(const ResourceRequest& , Resource::Type);
190 void addAdditionalRequestHeaders(ResourceRequest&, Resource::Type); 190 void addAdditionalRequestHeaders(ResourceRequest&, Resource::Type);
191 void maybeUpgradeInsecureRequestURL(FetchRequest&);
191 192
192 bool canRequest(Resource::Type, const ResourceRequest&, const KURL&, const R esourceLoaderOptions&, bool forPreload, FetchRequest::OriginRestriction) const; 193 bool canRequest(Resource::Type, const ResourceRequest&, const KURL&, const R esourceLoaderOptions&, bool forPreload, FetchRequest::OriginRestriction) 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
(...skipping 65 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

Powered by Google App Engine
This is Rietveld 408576698