Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(58)

Side by Side Diff: Source/core/loader/FrameLoader.h

Issue 1194003004: Oilpan: enable appcache + move DocumentLoader to the heap. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: rebased Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « Source/core/loader/FrameFetchContextTest.cpp ('k') | Source/core/loader/FrameLoader.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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
214 RawPtrWillBeMember<LocalFrame> m_frame; 216 RawPtrWillBeMember<LocalFrame> m_frame;
215 217
216 // FIXME: These should be OwnPtr<T> to reduce build times and simplify 218 // FIXME: These should be OwnPtr<T> to reduce build times and simplify
217 // header dependencies unless performance testing proves otherwise. 219 // header dependencies unless performance testing proves otherwise.
218 // Some of these could be lazily created for memory savings on devices. 220 // Some of these could be lazily created for memory savings on devices.
219 mutable FrameLoaderStateMachine m_stateMachine; 221 mutable FrameLoaderStateMachine m_stateMachine;
220 222
221 OwnPtrWillBeMember<ProgressTracker> m_progressTracker; 223 OwnPtrWillBeMember<ProgressTracker> m_progressTracker;
222 224
223 FrameLoadType m_loadType; 225 FrameLoadType m_loadType;
224 226
225 // Document loaders for the three phases of frame loading. Note that while 227 // Document loaders for the three phases of frame loading. Note that while
226 // a new request is being loaded, the old document loader may still be refer enced. 228 // a new request is being loaded, the old document loader may still be refer enced.
227 // E.g. while a new request is in the "policy" state, the old document loade r may 229 // E.g. while a new request is in the "policy" state, the old document loade r may
228 // be consulted in particular as it makes sense to imply certain settings on the new loader. 230 // be consulted in particular as it makes sense to imply certain settings on the new loader.
229 RefPtr<DocumentLoader> m_documentLoader; 231 RefPtrWillBeMember<DocumentLoader> m_documentLoader;
230 RefPtr<DocumentLoader> m_provisionalDocumentLoader; 232 RefPtrWillBeMember<DocumentLoader> m_provisionalDocumentLoader;
231 RefPtr<DocumentLoader> m_policyDocumentLoader; 233 RefPtrWillBeMember<DocumentLoader> m_policyDocumentLoader;
232 234
233 RefPtrWillBeMember<HistoryItem> m_currentItem; 235 RefPtrWillBeMember<HistoryItem> m_currentItem;
234 RefPtrWillBeMember<HistoryItem> m_provisionalItem; 236 RefPtrWillBeMember<HistoryItem> m_provisionalItem;
235 237
236 class DeferredHistoryLoad : public NoBaseWillBeGarbageCollectedFinalized<Def erredHistoryLoad> { 238 class DeferredHistoryLoad : public NoBaseWillBeGarbageCollectedFinalized<Def erredHistoryLoad> {
237 DISALLOW_COPY(DeferredHistoryLoad); 239 DISALLOW_COPY(DeferredHistoryLoad);
238 public: 240 public:
239 static PassOwnPtrWillBeRawPtr<DeferredHistoryLoad> create(ResourceReques t request, HistoryItem* item, FrameLoadType loadType, HistoryLoadType historyLoa dType) 241 static PassOwnPtrWillBeRawPtr<DeferredHistoryLoad> create(ResourceReques t request, HistoryItem* item, FrameLoadType loadType, HistoryLoadType historyLoa dType)
240 { 242 {
241 return adoptPtrWillBeNoop(new DeferredHistoryLoad(request, item, loa dType, historyLoadType)); 243 return adoptPtrWillBeNoop(new DeferredHistoryLoad(request, item, loa dType, historyLoadType));
(...skipping 29 matching lines...) Expand all
271 Timer<FrameLoader> m_didAccessInitialDocumentTimer; 273 Timer<FrameLoader> m_didAccessInitialDocumentTimer;
272 274
273 SandboxFlags m_forcedSandboxFlags; 275 SandboxFlags m_forcedSandboxFlags;
274 276
275 bool m_dispatchingDidClearWindowObjectInMainWorld; 277 bool m_dispatchingDidClearWindowObjectInMainWorld;
276 }; 278 };
277 279
278 } // namespace blink 280 } // namespace blink
279 281
280 #endif // FrameLoader_h 282 #endif // FrameLoader_h
OLDNEW
« no previous file with comments | « Source/core/loader/FrameFetchContextTest.cpp ('k') | Source/core/loader/FrameLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698