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

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: add outer loader protection 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
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 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
219 mutable FrameLoaderStateMachine m_stateMachine; 219 mutable FrameLoaderStateMachine m_stateMachine;
220 220
221 OwnPtrWillBeMember<ProgressTracker> m_progressTracker; 221 OwnPtrWillBeMember<ProgressTracker> m_progressTracker;
222 222
223 FrameLoadType m_loadType; 223 FrameLoadType m_loadType;
224 224
225 // 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
226 // 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.
227 // 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
228 // 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.
229 RefPtr<DocumentLoader> m_documentLoader; 229 RefPtrWillBeMember<DocumentLoader> m_documentLoader;
230 RefPtr<DocumentLoader> m_provisionalDocumentLoader; 230 RefPtrWillBeMember<DocumentLoader> m_provisionalDocumentLoader;
231 RefPtr<DocumentLoader> m_policyDocumentLoader; 231 RefPtrWillBeMember<DocumentLoader> m_policyDocumentLoader;
232 232
233 RefPtrWillBeMember<HistoryItem> m_currentItem; 233 RefPtrWillBeMember<HistoryItem> m_currentItem;
234 RefPtrWillBeMember<HistoryItem> m_provisionalItem; 234 RefPtrWillBeMember<HistoryItem> m_provisionalItem;
235 235
236 class DeferredHistoryLoad : public NoBaseWillBeGarbageCollectedFinalized<Def erredHistoryLoad> { 236 class DeferredHistoryLoad : public NoBaseWillBeGarbageCollectedFinalized<Def erredHistoryLoad> {
237 DISALLOW_COPY(DeferredHistoryLoad); 237 DISALLOW_COPY(DeferredHistoryLoad);
238 public: 238 public:
239 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)
240 { 240 {
241 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
271 Timer<FrameLoader> m_didAccessInitialDocumentTimer; 271 Timer<FrameLoader> m_didAccessInitialDocumentTimer;
272 272
273 SandboxFlags m_forcedSandboxFlags; 273 SandboxFlags m_forcedSandboxFlags;
274 274
275 bool m_dispatchingDidClearWindowObjectInMainWorld; 275 bool m_dispatchingDidClearWindowObjectInMainWorld;
276 }; 276 };
277 277
278 } // namespace blink 278 } // namespace blink
279 279
280 #endif // FrameLoader_h 280 #endif // FrameLoader_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698