| 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 DifferentDocument, | 204 DifferentDocument, |
| 205 Fragment, | 205 Fragment, |
| 206 HistoryApi | 206 HistoryApi |
| 207 }; | 207 }; |
| 208 void setHistoryItemStateForCommit(HistoryCommitType, HistoryNavigationType); | 208 void setHistoryItemStateForCommit(HistoryCommitType, HistoryNavigationType); |
| 209 | 209 |
| 210 void loadInSameDocument(const KURL&, PassRefPtr<SerializedScriptValue> state
Object, FrameLoadType, ClientRedirectPolicy); | 210 void loadInSameDocument(const KURL&, PassRefPtr<SerializedScriptValue> state
Object, FrameLoadType, ClientRedirectPolicy); |
| 211 | 211 |
| 212 void scheduleCheckCompleted(); | 212 void scheduleCheckCompleted(); |
| 213 | 213 |
| 214 void detachDocumentLoader(RefPtrWillBeMember<DocumentLoader>&); | |
| 215 | |
| 216 RawPtrWillBeMember<LocalFrame> m_frame; | 214 RawPtrWillBeMember<LocalFrame> m_frame; |
| 217 | 215 |
| 218 // FIXME: These should be OwnPtr<T> to reduce build times and simplify | 216 // FIXME: These should be OwnPtr<T> to reduce build times and simplify |
| 219 // header dependencies unless performance testing proves otherwise. | 217 // header dependencies unless performance testing proves otherwise. |
| 220 // Some of these could be lazily created for memory savings on devices. | 218 // Some of these could be lazily created for memory savings on devices. |
| 221 mutable FrameLoaderStateMachine m_stateMachine; | 219 mutable FrameLoaderStateMachine m_stateMachine; |
| 222 | 220 |
| 223 OwnPtrWillBeMember<ProgressTracker> m_progressTracker; | 221 OwnPtrWillBeMember<ProgressTracker> m_progressTracker; |
| 224 | 222 |
| 225 FrameLoadType m_loadType; | 223 FrameLoadType m_loadType; |
| 226 | 224 |
| 227 // Document loaders for the three phases of frame loading. Note that while | 225 // Document loaders for the three phases of frame loading. Note that while |
| 228 // a new request is being loaded, the old document loader may still be refer
enced. | 226 // a new request is being loaded, the old document loader may still be refer
enced. |
| 229 // E.g. while a new request is in the "policy" state, the old document loade
r may | 227 // E.g. while a new request is in the "policy" state, the old document loade
r may |
| 230 // be consulted in particular as it makes sense to imply certain settings on
the new loader. | 228 // be consulted in particular as it makes sense to imply certain settings on
the new loader. |
| 231 RefPtrWillBeMember<DocumentLoader> m_documentLoader; | 229 RefPtr<DocumentLoader> m_documentLoader; |
| 232 RefPtrWillBeMember<DocumentLoader> m_provisionalDocumentLoader; | 230 RefPtr<DocumentLoader> m_provisionalDocumentLoader; |
| 233 RefPtrWillBeMember<DocumentLoader> m_policyDocumentLoader; | 231 RefPtr<DocumentLoader> m_policyDocumentLoader; |
| 234 | 232 |
| 235 RefPtrWillBeMember<HistoryItem> m_currentItem; | 233 RefPtrWillBeMember<HistoryItem> m_currentItem; |
| 236 RefPtrWillBeMember<HistoryItem> m_provisionalItem; | 234 RefPtrWillBeMember<HistoryItem> m_provisionalItem; |
| 237 | 235 |
| 238 class DeferredHistoryLoad : public NoBaseWillBeGarbageCollectedFinalized<Def
erredHistoryLoad> { | 236 class DeferredHistoryLoad : public NoBaseWillBeGarbageCollectedFinalized<Def
erredHistoryLoad> { |
| 239 DISALLOW_COPY(DeferredHistoryLoad); | 237 DISALLOW_COPY(DeferredHistoryLoad); |
| 240 public: | 238 public: |
| 241 static PassOwnPtrWillBeRawPtr<DeferredHistoryLoad> create(ResourceReques
t request, HistoryItem* item, FrameLoadType loadType, HistoryLoadType historyLoa
dType) | 239 static PassOwnPtrWillBeRawPtr<DeferredHistoryLoad> create(ResourceReques
t request, HistoryItem* item, FrameLoadType loadType, HistoryLoadType historyLoa
dType) |
| 242 { | 240 { |
| 243 return adoptPtrWillBeNoop(new DeferredHistoryLoad(request, item, loa
dType, historyLoadType)); | 241 return adoptPtrWillBeNoop(new DeferredHistoryLoad(request, item, loa
dType, historyLoadType)); |
| (...skipping 29 matching lines...) Expand all Loading... |
| 273 Timer<FrameLoader> m_didAccessInitialDocumentTimer; | 271 Timer<FrameLoader> m_didAccessInitialDocumentTimer; |
| 274 | 272 |
| 275 SandboxFlags m_forcedSandboxFlags; | 273 SandboxFlags m_forcedSandboxFlags; |
| 276 | 274 |
| 277 bool m_dispatchingDidClearWindowObjectInMainWorld; | 275 bool m_dispatchingDidClearWindowObjectInMainWorld; |
| 278 }; | 276 }; |
| 279 | 277 |
| 280 } // namespace blink | 278 } // namespace blink |
| 281 | 279 |
| 282 #endif // FrameLoader_h | 280 #endif // FrameLoader_h |
| OLD | NEW |