OLD | NEW |
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. | 3 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. |
4 * (http://www.torchmobile.com/) | 4 * (http://www.torchmobile.com/) |
5 * Copyright (C) Research In Motion Limited 2009. All rights reserved. | 5 * Copyright (C) Research In Motion Limited 2009. All rights reserved. |
6 * Copyright (C) 2011 Google Inc. All rights reserved. | 6 * Copyright (C) 2011 Google Inc. All rights reserved. |
7 * | 7 * |
8 * Redistribution and use in source and binary forms, with or without | 8 * Redistribution and use in source and binary forms, with or without |
9 * modification, are permitted provided that the following conditions | 9 * modification, are permitted provided that the following conditions |
10 * are met: | 10 * are met: |
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
152 void dispatchDocumentElementAvailable(); | 152 void dispatchDocumentElementAvailable(); |
153 void runScriptsAtDocumentElementAvailable(); | 153 void runScriptsAtDocumentElementAvailable(); |
154 | 154 |
155 // The following sandbox flags will be forced, regardless of changes to the | 155 // The following sandbox flags will be forced, regardless of changes to the |
156 // sandbox attribute of any parent frames. | 156 // sandbox attribute of any parent frames. |
157 void forceSandboxFlags(SandboxFlags flags) { m_forcedSandboxFlags |= flags; } | 157 void forceSandboxFlags(SandboxFlags flags) { m_forcedSandboxFlags |= flags; } |
158 SandboxFlags effectiveSandboxFlags() const; | 158 SandboxFlags effectiveSandboxFlags() const; |
159 | 159 |
160 WebInsecureRequestPolicy getInsecureRequestPolicy() const; | 160 WebInsecureRequestPolicy getInsecureRequestPolicy() const; |
161 SecurityContext::InsecureNavigationsSet* insecureNavigationsToUpgrade() const; | 161 SecurityContext::InsecureNavigationsSet* insecureNavigationsToUpgrade() const; |
162 void upgradeInsecureRequest(ResourceRequest&, Document*) const; | 162 void modifyRequestForCSP(ResourceRequest&, Document*) const; |
163 | 163 |
164 Frame* opener(); | 164 Frame* opener(); |
165 void setOpener(LocalFrame*); | 165 void setOpener(LocalFrame*); |
166 | 166 |
| 167 const AtomicString& requiredCSP() const { return m_requiredCSP; } |
| 168 void setRequiredCSP(const AtomicString& requiredCSP) { |
| 169 m_requiredCSP = requiredCSP; |
| 170 } |
| 171 void recordLatestRequiredCSP(); |
| 172 |
167 void detach(); | 173 void detach(); |
168 | 174 |
169 void finishedParsing(); | 175 void finishedParsing(); |
170 void checkCompleted(); | 176 void checkCompleted(); |
171 | 177 |
172 void receivedMainResourceRedirect(const KURL& newURL); | 178 void receivedMainResourceRedirect(const KURL& newURL); |
173 | 179 |
174 void clearProvisionalHistoryItem(); | 180 void clearProvisionalHistoryItem(); |
175 | 181 |
176 // This prepares the FrameLoader for the next commit. It will dispatch unload | 182 // This prepares the FrameLoader for the next commit. It will dispatch unload |
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
247 PassRefPtr<SerializedScriptValue> stateObject, | 253 PassRefPtr<SerializedScriptValue> stateObject, |
248 FrameLoadType, | 254 FrameLoadType, |
249 HistoryLoadType, | 255 HistoryLoadType, |
250 ClientRedirectPolicy, | 256 ClientRedirectPolicy, |
251 Document*); | 257 Document*); |
252 | 258 |
253 void scheduleCheckCompleted(); | 259 void scheduleCheckCompleted(); |
254 | 260 |
255 void detachDocumentLoader(Member<DocumentLoader>&); | 261 void detachDocumentLoader(Member<DocumentLoader>&); |
256 | 262 |
| 263 void upgradeInsecureRequest(ResourceRequest&, Document*) const; |
| 264 |
257 std::unique_ptr<TracedValue> toTracedValue() const; | 265 std::unique_ptr<TracedValue> toTracedValue() const; |
258 void takeObjectSnapshot() const; | 266 void takeObjectSnapshot() const; |
259 | 267 |
260 Member<LocalFrame> m_frame; | 268 Member<LocalFrame> m_frame; |
| 269 AtomicString m_requiredCSP; |
261 | 270 |
262 // FIXME: These should be std::unique_ptr<T> to reduce build times and | 271 // FIXME: These should be std::unique_ptr<T> to reduce build times and |
263 // simplify header dependencies unless performance testing proves otherwise. | 272 // simplify header dependencies unless performance testing proves otherwise. |
264 // Some of these could be lazily created for memory savings on devices. | 273 // Some of these could be lazily created for memory savings on devices. |
265 mutable FrameLoaderStateMachine m_stateMachine; | 274 mutable FrameLoaderStateMachine m_stateMachine; |
266 | 275 |
267 Member<ProgressTracker> m_progressTracker; | 276 Member<ProgressTracker> m_progressTracker; |
268 | 277 |
269 FrameLoadType m_loadType; | 278 FrameLoadType m_loadType; |
270 | 279 |
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
317 SandboxFlags m_forcedSandboxFlags; | 326 SandboxFlags m_forcedSandboxFlags; |
318 | 327 |
319 bool m_dispatchingDidClearWindowObjectInMainWorld; | 328 bool m_dispatchingDidClearWindowObjectInMainWorld; |
320 bool m_protectProvisionalLoader; | 329 bool m_protectProvisionalLoader; |
321 bool m_isNavigationHandledByClient; | 330 bool m_isNavigationHandledByClient; |
322 }; | 331 }; |
323 | 332 |
324 } // namespace blink | 333 } // namespace blink |
325 | 334 |
326 #endif // FrameLoader_h | 335 #endif // FrameLoader_h |
OLD | NEW |