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

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

Issue 2372563002: Adding Embedding-CSP HTTP header (Closed)
Patch Set: Moving requiredCSP to FrameLoader Created 4 years, 2 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) 2006, 2007, 2008, 2009, 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008, 2009, 2011 Apple Inc. All rights reserved.
3 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 3 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
4 * Copyright (C) Research In Motion Limited 2009. All rights reserved. 4 * Copyright (C) Research In Motion Limited 2009. All rights reserved.
5 * Copyright (C) 2011 Google Inc. All rights reserved. 5 * Copyright (C) 2011 Google Inc. All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 10 *
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 void dispatchDocumentElementAvailable(); 141 void dispatchDocumentElementAvailable();
142 void runScriptsAtDocumentElementAvailable(); 142 void runScriptsAtDocumentElementAvailable();
143 143
144 // The following sandbox flags will be forced, regardless of changes to 144 // The following sandbox flags will be forced, regardless of changes to
145 // the sandbox attribute of any parent frames. 145 // the sandbox attribute of any parent frames.
146 void forceSandboxFlags(SandboxFlags flags) { m_forcedSandboxFlags |= flags; } 146 void forceSandboxFlags(SandboxFlags flags) { m_forcedSandboxFlags |= flags; }
147 SandboxFlags effectiveSandboxFlags() const; 147 SandboxFlags effectiveSandboxFlags() const;
148 148
149 WebInsecureRequestPolicy getInsecureRequestPolicy() const; 149 WebInsecureRequestPolicy getInsecureRequestPolicy() const;
150 SecurityContext::InsecureNavigationsSet* insecureNavigationsToUpgrade() cons t; 150 SecurityContext::InsecureNavigationsSet* insecureNavigationsToUpgrade() cons t;
151 void upgradeInsecureRequest(ResourceRequest&, Document*) const; 151 void addOutgoingSecurityHeaders(ResourceRequest&, Document*) const;
152 152
153 Frame* opener(); 153 Frame* opener();
154 void setOpener(LocalFrame*); 154 void setOpener(LocalFrame*);
155 155
156 const AtomicString& requiredCSP() const { return m_requiredCSP; }
157 void setRequiredCSP(const AtomicString& requiredCSP) { m_requiredCSP = requi redCSP; }
158 void recordLatestRequiredCSP();
159
156 void detach(); 160 void detach();
157 161
158 void finishedParsing(); 162 void finishedParsing();
159 void checkCompleted(); 163 void checkCompleted();
160 164
161 void receivedMainResourceRedirect(const KURL& newURL); 165 void receivedMainResourceRedirect(const KURL& newURL);
162 166
163 void clearProvisionalHistoryItem(); 167 void clearProvisionalHistoryItem();
164 168
165 // This prepares the FrameLoader for the next commit. It will dispatch 169 // This prepares the FrameLoader for the next commit. It will dispatch
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
220 void loadInSameDocument(const KURL&, PassRefPtr<SerializedScriptValue> state Object, FrameLoadType, HistoryLoadType, ClientRedirectPolicy, Document*); 224 void loadInSameDocument(const KURL&, PassRefPtr<SerializedScriptValue> state Object, FrameLoadType, HistoryLoadType, ClientRedirectPolicy, Document*);
221 225
222 void scheduleCheckCompleted(); 226 void scheduleCheckCompleted();
223 227
224 void detachDocumentLoader(Member<DocumentLoader>&); 228 void detachDocumentLoader(Member<DocumentLoader>&);
225 229
226 std::unique_ptr<TracedValue> toTracedValue() const; 230 std::unique_ptr<TracedValue> toTracedValue() const;
227 void takeObjectSnapshot() const; 231 void takeObjectSnapshot() const;
228 232
229 Member<LocalFrame> m_frame; 233 Member<LocalFrame> m_frame;
234 AtomicString m_requiredCSP;
230 235
231 // FIXME: These should be std::unique_ptr<T> to reduce build times and simpl ify 236 // FIXME: These should be std::unique_ptr<T> to reduce build times and simpl ify
232 // header dependencies unless performance testing proves otherwise. 237 // header dependencies unless performance testing proves otherwise.
233 // Some of these could be lazily created for memory savings on devices. 238 // Some of these could be lazily created for memory savings on devices.
234 mutable FrameLoaderStateMachine m_stateMachine; 239 mutable FrameLoaderStateMachine m_stateMachine;
235 240
236 Member<ProgressTracker> m_progressTracker; 241 Member<ProgressTracker> m_progressTracker;
237 242
238 FrameLoadType m_loadType; 243 FrameLoadType m_loadType;
239 244
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
284 SandboxFlags m_forcedSandboxFlags; 289 SandboxFlags m_forcedSandboxFlags;
285 290
286 bool m_dispatchingDidClearWindowObjectInMainWorld; 291 bool m_dispatchingDidClearWindowObjectInMainWorld;
287 bool m_protectProvisionalLoader; 292 bool m_protectProvisionalLoader;
288 bool m_isNavigationHandledByClient; 293 bool m_isNavigationHandledByClient;
289 }; 294 };
290 295
291 } // namespace blink 296 } // namespace blink
292 297
293 #endif // FrameLoader_h 298 #endif // FrameLoader_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698