| 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 197 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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, HistoryLoadType, 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(Member<DocumentLoader>&); |
| 219 | 219 |
| 220 RawPtrWillBeMember<LocalFrame> m_frame; | 220 Member<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. |
| 225 mutable FrameLoaderStateMachine m_stateMachine; | 225 mutable FrameLoaderStateMachine m_stateMachine; |
| 226 | 226 |
| 227 OwnPtrWillBeMember<ProgressTracker> m_progressTracker; | 227 Member<ProgressTracker> m_progressTracker; |
| 228 | 228 |
| 229 FrameLoadType m_loadType; | 229 FrameLoadType m_loadType; |
| 230 | 230 |
| 231 // Document loaders for the three phases of frame loading. Note that while | 231 // Document loaders for the three phases of frame loading. Note that while |
| 232 // a new request is being loaded, the old document loader may still be refer
enced. | 232 // a new request is being loaded, the old document loader may still be refer
enced. |
| 233 // E.g. while a new request is in the "policy" state, the old document loade
r may | 233 // E.g. while a new request is in the "policy" state, the old document loade
r may |
| 234 // be consulted in particular as it makes sense to imply certain settings on
the new loader. | 234 // be consulted in particular as it makes sense to imply certain settings on
the new loader. |
| 235 RefPtrWillBeMember<DocumentLoader> m_documentLoader; | 235 Member<DocumentLoader> m_documentLoader; |
| 236 RefPtrWillBeMember<DocumentLoader> m_provisionalDocumentLoader; | 236 Member<DocumentLoader> m_provisionalDocumentLoader; |
| 237 | 237 |
| 238 RefPtrWillBeMember<HistoryItem> m_currentItem; | 238 Member<HistoryItem> m_currentItem; |
| 239 RefPtrWillBeMember<HistoryItem> m_provisionalItem; | 239 Member<HistoryItem> m_provisionalItem; |
| 240 | 240 |
| 241 class DeferredHistoryLoad : public NoBaseWillBeGarbageCollectedFinalized<Def
erredHistoryLoad> { | 241 class DeferredHistoryLoad : public GarbageCollectedFinalized<DeferredHistory
Load> { |
| 242 WTF_MAKE_NONCOPYABLE(DeferredHistoryLoad); | 242 WTF_MAKE_NONCOPYABLE(DeferredHistoryLoad); |
| 243 public: | 243 public: |
| 244 static PassOwnPtrWillBeRawPtr<DeferredHistoryLoad> create(ResourceReques
t request, HistoryItem* item, FrameLoadType loadType, HistoryLoadType historyLoa
dType) | 244 static RawPtr<DeferredHistoryLoad> create(ResourceRequest request, Histo
ryItem* item, FrameLoadType loadType, HistoryLoadType historyLoadType) |
| 245 { | 245 { |
| 246 return adoptPtrWillBeNoop(new DeferredHistoryLoad(request, item, loa
dType, historyLoadType)); | 246 return (new DeferredHistoryLoad(request, item, loadType, historyLoad
Type)); |
| 247 } | 247 } |
| 248 | 248 |
| 249 DeferredHistoryLoad(ResourceRequest request, HistoryItem* item, FrameLoa
dType loadType, | 249 DeferredHistoryLoad(ResourceRequest request, HistoryItem* item, FrameLoa
dType loadType, |
| 250 HistoryLoadType historyLoadType) | 250 HistoryLoadType historyLoadType) |
| 251 : m_request(request) | 251 : m_request(request) |
| 252 , m_item(item) | 252 , m_item(item) |
| 253 , m_loadType(loadType) | 253 , m_loadType(loadType) |
| 254 , m_historyLoadType(historyLoadType) | 254 , m_historyLoadType(historyLoadType) |
| 255 { | 255 { |
| 256 } | 256 } |
| 257 | 257 |
| 258 DEFINE_INLINE_TRACE() | 258 DEFINE_INLINE_TRACE() |
| 259 { | 259 { |
| 260 visitor->trace(m_item); | 260 visitor->trace(m_item); |
| 261 } | 261 } |
| 262 | 262 |
| 263 ResourceRequest m_request; | 263 ResourceRequest m_request; |
| 264 RefPtrWillBeMember<HistoryItem> m_item; | 264 Member<HistoryItem> m_item; |
| 265 FrameLoadType m_loadType; | 265 FrameLoadType m_loadType; |
| 266 HistoryLoadType m_historyLoadType; | 266 HistoryLoadType m_historyLoadType; |
| 267 }; | 267 }; |
| 268 | 268 |
| 269 OwnPtrWillBeMember<DeferredHistoryLoad> m_deferredHistoryLoad; | 269 Member<DeferredHistoryLoad> m_deferredHistoryLoad; |
| 270 | 270 |
| 271 bool m_inStopAllLoaders; | 271 bool m_inStopAllLoaders; |
| 272 | 272 |
| 273 Timer<FrameLoader> m_checkTimer; | 273 Timer<FrameLoader> m_checkTimer; |
| 274 | 274 |
| 275 bool m_didAccessInitialDocument; | 275 bool m_didAccessInitialDocument; |
| 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 |