| 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 249 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 260 | 260 |
| 261 void scheduleCheckCompleted(); | 261 void scheduleCheckCompleted(); |
| 262 | 262 |
| 263 void detachDocumentLoader(Member<DocumentLoader>&); | 263 void detachDocumentLoader(Member<DocumentLoader>&); |
| 264 | 264 |
| 265 void upgradeInsecureRequest(ResourceRequest&, Document*) const; | 265 void upgradeInsecureRequest(ResourceRequest&, Document*) const; |
| 266 | 266 |
| 267 std::unique_ptr<TracedValue> toTracedValue() const; | 267 std::unique_ptr<TracedValue> toTracedValue() const; |
| 268 void takeObjectSnapshot() const; | 268 void takeObjectSnapshot() const; |
| 269 | 269 |
| 270 DocumentLoader* createDocumentLoader(const ResourceRequest&, |
| 271 const FrameLoadRequest&, |
| 272 FrameLoadType, |
| 273 NavigationType); |
| 274 |
| 270 Member<LocalFrame> m_frame; | 275 Member<LocalFrame> m_frame; |
| 271 AtomicString m_requiredCSP; | 276 AtomicString m_requiredCSP; |
| 272 | 277 |
| 273 // FIXME: These should be std::unique_ptr<T> to reduce build times and | 278 // FIXME: These should be std::unique_ptr<T> to reduce build times and |
| 274 // simplify header dependencies unless performance testing proves otherwise. | 279 // simplify header dependencies unless performance testing proves otherwise. |
| 275 // Some of these could be lazily created for memory savings on devices. | 280 // Some of these could be lazily created for memory savings on devices. |
| 276 mutable FrameLoaderStateMachine m_stateMachine; | 281 mutable FrameLoaderStateMachine m_stateMachine; |
| 277 | 282 |
| 278 Member<ProgressTracker> m_progressTracker; | 283 Member<ProgressTracker> m_progressTracker; |
| 279 | 284 |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 326 SandboxFlags m_forcedSandboxFlags; | 331 SandboxFlags m_forcedSandboxFlags; |
| 327 | 332 |
| 328 bool m_dispatchingDidClearWindowObjectInMainWorld; | 333 bool m_dispatchingDidClearWindowObjectInMainWorld; |
| 329 bool m_protectProvisionalLoader; | 334 bool m_protectProvisionalLoader; |
| 330 bool m_isNavigationHandledByClient; | 335 bool m_isNavigationHandledByClient; |
| 331 }; | 336 }; |
| 332 | 337 |
| 333 } // namespace blink | 338 } // namespace blink |
| 334 | 339 |
| 335 #endif // FrameLoader_h | 340 #endif // FrameLoader_h |
| OLD | NEW |