| 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 25 matching lines...) Expand all  Loading... | 
| 36 #include "core/dom/IconURL.h" | 36 #include "core/dom/IconURL.h" | 
| 37 #include "core/dom/SandboxFlags.h" | 37 #include "core/dom/SandboxFlags.h" | 
| 38 #include "core/dom/SecurityContext.h" | 38 #include "core/dom/SecurityContext.h" | 
| 39 #include "core/fetch/ResourceLoaderOptions.h" | 39 #include "core/fetch/ResourceLoaderOptions.h" | 
| 40 #include "core/frame/FrameTypes.h" | 40 #include "core/frame/FrameTypes.h" | 
| 41 #include "core/loader/FrameLoaderStateMachine.h" | 41 #include "core/loader/FrameLoaderStateMachine.h" | 
| 42 #include "core/loader/FrameLoaderTypes.h" | 42 #include "core/loader/FrameLoaderTypes.h" | 
| 43 #include "core/loader/HistoryItem.h" | 43 #include "core/loader/HistoryItem.h" | 
| 44 #include "core/loader/NavigationPolicy.h" | 44 #include "core/loader/NavigationPolicy.h" | 
| 45 #include "platform/Timer.h" | 45 #include "platform/Timer.h" | 
|  | 46 #include "platform/TracedValue.h" | 
| 46 #include "platform/heap/Handle.h" | 47 #include "platform/heap/Handle.h" | 
| 47 #include "platform/network/ResourceRequest.h" | 48 #include "platform/network/ResourceRequest.h" | 
| 48 #include "wtf/Forward.h" | 49 #include "wtf/Forward.h" | 
| 49 #include "wtf/HashSet.h" | 50 #include "wtf/HashSet.h" | 
| 50 | 51 | 
| 51 namespace blink { | 52 namespace blink { | 
| 52 | 53 | 
| 53 class DocumentLoader; | 54 class DocumentLoader; | 
| 54 class Frame; | 55 class Frame; | 
| 55 class FrameLoaderClient; | 56 class FrameLoaderClient; | 
| (...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 211         HistoryApi | 212         HistoryApi | 
| 212     }; | 213     }; | 
| 213     void setHistoryItemStateForCommit(HistoryCommitType, HistoryNavigationType); | 214     void setHistoryItemStateForCommit(HistoryCommitType, HistoryNavigationType); | 
| 214 | 215 | 
| 215     void loadInSameDocument(const KURL&, PassRefPtr<SerializedScriptValue> state
     Object, FrameLoadType, HistoryLoadType, ClientRedirectPolicy); | 216     void loadInSameDocument(const KURL&, PassRefPtr<SerializedScriptValue> state
     Object, FrameLoadType, HistoryLoadType, ClientRedirectPolicy); | 
| 216 | 217 | 
| 217     void scheduleCheckCompleted(); | 218     void scheduleCheckCompleted(); | 
| 218 | 219 | 
| 219     void detachDocumentLoader(Member<DocumentLoader>&); | 220     void detachDocumentLoader(Member<DocumentLoader>&); | 
| 220 | 221 | 
|  | 222     PassOwnPtr<TracedValue> toTracedValue() const; | 
|  | 223     void takeObjectSnapshot() const; | 
|  | 224 | 
| 221     Member<LocalFrame> m_frame; | 225     Member<LocalFrame> m_frame; | 
| 222 | 226 | 
| 223     // FIXME: These should be OwnPtr<T> to reduce build times and simplify | 227     // FIXME: These should be OwnPtr<T> to reduce build times and simplify | 
| 224     // header dependencies unless performance testing proves otherwise. | 228     // header dependencies unless performance testing proves otherwise. | 
| 225     // Some of these could be lazily created for memory savings on devices. | 229     // Some of these could be lazily created for memory savings on devices. | 
| 226     mutable FrameLoaderStateMachine m_stateMachine; | 230     mutable FrameLoaderStateMachine m_stateMachine; | 
| 227 | 231 | 
| 228     Member<ProgressTracker> m_progressTracker; | 232     Member<ProgressTracker> m_progressTracker; | 
| 229 | 233 | 
| 230     FrameLoadType m_loadType; | 234     FrameLoadType m_loadType; | 
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 278 | 282 | 
| 279     SandboxFlags m_forcedSandboxFlags; | 283     SandboxFlags m_forcedSandboxFlags; | 
| 280 | 284 | 
| 281     bool m_dispatchingDidClearWindowObjectInMainWorld; | 285     bool m_dispatchingDidClearWindowObjectInMainWorld; | 
| 282     bool m_protectProvisionalLoader; | 286     bool m_protectProvisionalLoader; | 
| 283 }; | 287 }; | 
| 284 | 288 | 
| 285 } // namespace blink | 289 } // namespace blink | 
| 286 | 290 | 
| 287 #endif // FrameLoader_h | 291 #endif // FrameLoader_h | 
| OLD | NEW | 
|---|