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 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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/TracedValue.h" |
47 #include "platform/heap/Handle.h" | 47 #include "platform/heap/Handle.h" |
48 #include "platform/network/ResourceRequest.h" | 48 #include "platform/network/ResourceRequest.h" |
49 #include "public/platform/WebInsecureRequestPolicy.h" | 49 #include "public/platform/WebInsecureRequestPolicy.h" |
50 #include "wtf/Forward.h" | 50 #include "wtf/Forward.h" |
51 #include "wtf/HashSet.h" | 51 #include "wtf/HashSet.h" |
52 #include <memory> | |
53 | 52 |
54 namespace blink { | 53 namespace blink { |
55 | 54 |
56 class DocumentLoader; | 55 class DocumentLoader; |
57 class Frame; | 56 class Frame; |
58 class FrameLoaderClient; | 57 class FrameLoaderClient; |
59 class ProgressTracker; | 58 class ProgressTracker; |
60 class ResourceError; | 59 class ResourceError; |
61 class SerializedScriptValue; | 60 class SerializedScriptValue; |
62 class SubstituteData; | 61 class SubstituteData; |
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
215 HistoryApi | 214 HistoryApi |
216 }; | 215 }; |
217 void setHistoryItemStateForCommit(HistoryCommitType, HistoryNavigationType); | 216 void setHistoryItemStateForCommit(HistoryCommitType, HistoryNavigationType); |
218 | 217 |
219 void loadInSameDocument(const KURL&, PassRefPtr<SerializedScriptValue> state
Object, FrameLoadType, HistoryLoadType, ClientRedirectPolicy, Document*); | 218 void loadInSameDocument(const KURL&, PassRefPtr<SerializedScriptValue> state
Object, FrameLoadType, HistoryLoadType, ClientRedirectPolicy, Document*); |
220 | 219 |
221 void scheduleCheckCompleted(); | 220 void scheduleCheckCompleted(); |
222 | 221 |
223 void detachDocumentLoader(Member<DocumentLoader>&); | 222 void detachDocumentLoader(Member<DocumentLoader>&); |
224 | 223 |
225 std::unique_ptr<TracedValue> toTracedValue() const; | 224 PassOwnPtr<TracedValue> toTracedValue() const; |
226 void takeObjectSnapshot() const; | 225 void takeObjectSnapshot() const; |
227 | 226 |
228 Member<LocalFrame> m_frame; | 227 Member<LocalFrame> m_frame; |
229 | 228 |
230 // FIXME: These should be std::unique_ptr<T> to reduce build times and simpl
ify | 229 // FIXME: These should be OwnPtr<T> to reduce build times and simplify |
231 // header dependencies unless performance testing proves otherwise. | 230 // header dependencies unless performance testing proves otherwise. |
232 // Some of these could be lazily created for memory savings on devices. | 231 // Some of these could be lazily created for memory savings on devices. |
233 mutable FrameLoaderStateMachine m_stateMachine; | 232 mutable FrameLoaderStateMachine m_stateMachine; |
234 | 233 |
235 Member<ProgressTracker> m_progressTracker; | 234 Member<ProgressTracker> m_progressTracker; |
236 | 235 |
237 FrameLoadType m_loadType; | 236 FrameLoadType m_loadType; |
238 | 237 |
239 // Document loaders for the three phases of frame loading. Note that while | 238 // Document loaders for the three phases of frame loading. Note that while |
240 // a new request is being loaded, the old document loader may still be refer
enced. | 239 // a new request is being loaded, the old document loader may still be refer
enced. |
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
285 | 284 |
286 SandboxFlags m_forcedSandboxFlags; | 285 SandboxFlags m_forcedSandboxFlags; |
287 | 286 |
288 bool m_dispatchingDidClearWindowObjectInMainWorld; | 287 bool m_dispatchingDidClearWindowObjectInMainWorld; |
289 bool m_protectProvisionalLoader; | 288 bool m_protectProvisionalLoader; |
290 }; | 289 }; |
291 | 290 |
292 } // namespace blink | 291 } // namespace blink |
293 | 292 |
294 #endif // FrameLoader_h | 293 #endif // FrameLoader_h |
OLD | NEW |