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

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

Issue 2551893002: Upgrade-Insecure-Requests: Split CSP checks into pre-upgrade and post-upgrade.
Patch Set: Created 4 years 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 19 matching lines...) Expand all
30 30
31 #ifndef FrameFetchContext_h 31 #ifndef FrameFetchContext_h
32 #define FrameFetchContext_h 32 #define FrameFetchContext_h
33 33
34 #include "core/CoreExport.h" 34 #include "core/CoreExport.h"
35 #include "core/fetch/FetchContext.h" 35 #include "core/fetch/FetchContext.h"
36 #include "core/fetch/ResourceFetcher.h" 36 #include "core/fetch/ResourceFetcher.h"
37 #include "core/frame/csp/ContentSecurityPolicy.h" 37 #include "core/frame/csp/ContentSecurityPolicy.h"
38 #include "core/loader/LinkLoader.h" 38 #include "core/loader/LinkLoader.h"
39 #include "platform/heap/Handle.h" 39 #include "platform/heap/Handle.h"
40 #include "platform/network/ContentSecurityPolicyParsers.h"
40 #include "platform/network/ResourceRequest.h" 41 #include "platform/network/ResourceRequest.h"
41 42
42 namespace blink { 43 namespace blink {
43 44
44 class Document; 45 class Document;
45 class DocumentLoader; 46 class DocumentLoader;
46 class LocalFrame; 47 class LocalFrame;
47 class ResourceError; 48 class ResourceError;
48 class ResourceResponse; 49 class ResourceResponse;
49 class ResourceRequest; 50 class ResourceRequest;
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 void didLoadResource(Resource*) override; 113 void didLoadResource(Resource*) override;
113 114
114 void addResourceTiming(const ResourceTimingInfo&) override; 115 void addResourceTiming(const ResourceTimingInfo&) override;
115 bool allowImage(bool imagesEnabled, const KURL&) const override; 116 bool allowImage(bool imagesEnabled, const KURL&) const override;
116 bool canRequest(Resource::Type, 117 bool canRequest(Resource::Type,
117 const ResourceRequest&, 118 const ResourceRequest&,
118 const KURL&, 119 const KURL&,
119 const ResourceLoaderOptions&, 120 const ResourceLoaderOptions&,
120 bool forPreload, 121 bool forPreload,
121 FetchRequest::OriginRestriction) const override; 122 FetchRequest::OriginRestriction) const override;
123 ResourceRequestBlockedReason checkCSPForRequest(
124 const ResourceRequest&,
125 const KURL&,
126 const ResourceLoaderOptions&,
127 bool forPreload,
128 ResourceRequest::RedirectStatus,
129 ContentSecurityPolicyHeaderType) const override;
122 bool allowResponse(Resource::Type, 130 bool allowResponse(Resource::Type,
123 const ResourceRequest&, 131 const ResourceRequest&,
124 const KURL&, 132 const KURL&,
125 const ResourceLoaderOptions&) const override; 133 const ResourceLoaderOptions&) const override;
126 134
127 bool isControlledByServiceWorker() const override; 135 bool isControlledByServiceWorker() const override;
128 int64_t serviceWorkerID() const override; 136 int64_t serviceWorkerID() const override;
129 137
130 bool isMainFrame() const override; 138 bool isMainFrame() const override;
131 bool defersLoading() const override; 139 bool defersLoading() const override;
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 // FIXME: Oilpan: Ideally this should just be a traced Member but that will 189 // FIXME: Oilpan: Ideally this should just be a traced Member but that will
182 // currently leak because ComputedStyle and its data are not on the heap. 190 // currently leak because ComputedStyle and its data are not on the heap.
183 // See crbug.com/383860 for details. 191 // See crbug.com/383860 for details.
184 WeakMember<Document> m_document; 192 WeakMember<Document> m_document;
185 Member<DocumentLoader> m_documentLoader; 193 Member<DocumentLoader> m_documentLoader;
186 }; 194 };
187 195
188 } // namespace blink 196 } // namespace blink
189 197
190 #endif 198 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698