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

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

Issue 2068443002: Revert of Move 'frame-src' CSP checks into FrameFetchContext. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: run revert on local machine to resolve conflicts Created 4 years, 6 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 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 116
117 DECLARE_VIRTUAL_TRACE(); 117 DECLARE_VIRTUAL_TRACE();
118 118
119 private: 119 private:
120 explicit FrameFetchContext(DocumentLoader*, Document*); 120 explicit FrameFetchContext(DocumentLoader*, Document*);
121 inline DocumentLoader* masterDocumentLoader() const; 121 inline DocumentLoader* masterDocumentLoader() const;
122 122
123 LocalFrame* frame() const; // Can be null 123 LocalFrame* frame() const; // Can be null
124 void printAccessDeniedMessage(const KURL&) const; 124 void printAccessDeniedMessage(const KURL&) const;
125 ResourceRequestBlockedReason canRequestInternal(Resource::Type, const Resour ceRequest&, const KURL&, const ResourceLoaderOptions&, bool forPreload, FetchReq uest::OriginRestriction, ResourceRequest::RedirectStatus) const; 125 ResourceRequestBlockedReason canRequestInternal(Resource::Type, const Resour ceRequest&, const KURL&, const ResourceLoaderOptions&, bool forPreload, FetchReq uest::OriginRestriction, ResourceRequest::RedirectStatus) const;
126 bool contentSecurityPolicyBlocksRequest(Resource::Type, const ResourceReques t&, const KURL&, const ResourceLoaderOptions&, bool forPreload, ResourceRequest: :RedirectStatus) const;
127 126
128 void prepareRequest(unsigned long identifier, ResourceRequest&, const Resour ceResponse&); 127 void prepareRequest(unsigned long identifier, ResourceRequest&, const Resour ceResponse&);
129 128
130 // FIXME: Oilpan: Ideally this should just be a traced Member but that will 129 // FIXME: Oilpan: Ideally this should just be a traced Member but that will
131 // currently leak because ComputedStyle and its data are not on the heap. 130 // currently leak because ComputedStyle and its data are not on the heap.
132 // See crbug.com/383860 for details. 131 // See crbug.com/383860 for details.
133 WeakMember<Document> m_document; 132 WeakMember<Document> m_document;
134 Member<DocumentLoader> m_documentLoader; 133 Member<DocumentLoader> m_documentLoader;
135 }; 134 };
136 135
137 } // namespace blink 136 } // namespace blink
138 137
139 #endif 138 #endif
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/loader/DocumentLoader.cpp ('k') | third_party/WebKit/Source/core/loader/FrameFetchContext.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698