| 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. (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 193 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 204 | 204 |
| 205 void startLoad(FrameLoadRequest&, FrameLoadType, NavigationPolicy); | 205 void startLoad(FrameLoadRequest&, FrameLoadType, NavigationPolicy); |
| 206 | 206 |
| 207 enum class HistoryNavigationType { | 207 enum class HistoryNavigationType { |
| 208 DifferentDocument, | 208 DifferentDocument, |
| 209 Fragment, | 209 Fragment, |
| 210 HistoryApi | 210 HistoryApi |
| 211 }; | 211 }; |
| 212 void setHistoryItemStateForCommit(HistoryCommitType, HistoryNavigationType); | 212 void setHistoryItemStateForCommit(HistoryCommitType, HistoryNavigationType); |
| 213 | 213 |
| 214 void loadInSameDocument(const KURL&, PassRefPtr<SerializedScriptValue> state
Object, FrameLoadType, ClientRedirectPolicy); | 214 void loadInSameDocument(const KURL&, PassRefPtr<SerializedScriptValue> state
Object, FrameLoadType, HistoryLoadType, ClientRedirectPolicy); |
| 215 | 215 |
| 216 void scheduleCheckCompleted(); | 216 void scheduleCheckCompleted(); |
| 217 | 217 |
| 218 void detachDocumentLoader(RefPtrWillBeMember<DocumentLoader>&); | 218 void detachDocumentLoader(RefPtrWillBeMember<DocumentLoader>&); |
| 219 | 219 |
| 220 RawPtrWillBeMember<LocalFrame> m_frame; | 220 RawPtrWillBeMember<LocalFrame> m_frame; |
| 221 | 221 |
| 222 // FIXME: These should be OwnPtr<T> to reduce build times and simplify | 222 // FIXME: These should be OwnPtr<T> to reduce build times and simplify |
| 223 // header dependencies unless performance testing proves otherwise. | 223 // header dependencies unless performance testing proves otherwise. |
| 224 // Some of these could be lazily created for memory savings on devices. | 224 // Some of these could be lazily created for memory savings on devices. |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 276 Timer<FrameLoader> m_didAccessInitialDocumentTimer; | 276 Timer<FrameLoader> m_didAccessInitialDocumentTimer; |
| 277 | 277 |
| 278 SandboxFlags m_forcedSandboxFlags; | 278 SandboxFlags m_forcedSandboxFlags; |
| 279 | 279 |
| 280 bool m_dispatchingDidClearWindowObjectInMainWorld; | 280 bool m_dispatchingDidClearWindowObjectInMainWorld; |
| 281 }; | 281 }; |
| 282 | 282 |
| 283 } // namespace blink | 283 } // namespace blink |
| 284 | 284 |
| 285 #endif // FrameLoader_h | 285 #endif // FrameLoader_h |
| OLD | NEW |