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

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

Issue 639023004: Oilpan: move HistoryItem to the heap. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 2 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 | « no previous file | 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 221 matching lines...) Expand 10 before | Expand all | Expand 10 after
232 232
233 // Document loaders for the three phases of frame loading. Note that while 233 // Document loaders for the three phases of frame loading. Note that while
234 // a new request is being loaded, the old document loader may still be refer enced. 234 // a new request is being loaded, the old document loader may still be refer enced.
235 // E.g. while a new request is in the "policy" state, the old document loade r may 235 // E.g. while a new request is in the "policy" state, the old document loade r may
236 // be consulted in particular as it makes sense to imply certain settings on the new loader. 236 // be consulted in particular as it makes sense to imply certain settings on the new loader.
237 RefPtr<DocumentLoader> m_documentLoader; 237 RefPtr<DocumentLoader> m_documentLoader;
238 RefPtr<DocumentLoader> m_provisionalDocumentLoader; 238 RefPtr<DocumentLoader> m_provisionalDocumentLoader;
239 RefPtr<DocumentLoader> m_policyDocumentLoader; 239 RefPtr<DocumentLoader> m_policyDocumentLoader;
240 OwnPtrWillBeMember<FetchContext> m_fetchContext; 240 OwnPtrWillBeMember<FetchContext> m_fetchContext;
241 241
242 RefPtr<HistoryItem> m_currentItem; 242 RefPtrWillBeMember<HistoryItem> m_currentItem;
243 RefPtr<HistoryItem> m_provisionalItem; 243 RefPtrWillBeMember<HistoryItem> m_provisionalItem;
244
244 struct DeferredHistoryLoad { 245 struct DeferredHistoryLoad {
246 DISALLOW_ALLOCATION();
247 public:
245 DeferredHistoryLoad(HistoryItem* item, HistoryLoadType type, ResourceReq uestCachePolicy cachePolicy) 248 DeferredHistoryLoad(HistoryItem* item, HistoryLoadType type, ResourceReq uestCachePolicy cachePolicy)
246 : m_item(item) 249 : m_item(item)
247 , m_type(type) 250 , m_type(type)
248 , m_cachePolicy(cachePolicy) 251 , m_cachePolicy(cachePolicy)
249 { 252 {
250 } 253 }
251 254
252 DeferredHistoryLoad() { } 255 DeferredHistoryLoad() { }
253 256
254 bool isValid() { return m_item; } 257 bool isValid() { return m_item; }
255 258
256 RefPtr<HistoryItem> m_item; 259 void trace(Visitor* visitor)
260 {
261 visitor->trace(m_item);
262 }
263
264 RefPtrWillBeMember<HistoryItem> m_item;
257 HistoryLoadType m_type; 265 HistoryLoadType m_type;
258 ResourceRequestCachePolicy m_cachePolicy; 266 ResourceRequestCachePolicy m_cachePolicy;
259 }; 267 };
268
260 DeferredHistoryLoad m_deferredHistoryLoad; 269 DeferredHistoryLoad m_deferredHistoryLoad;
261 270
262 bool m_inStopAllLoaders; 271 bool m_inStopAllLoaders;
263 272
264 Timer<FrameLoader> m_checkTimer; 273 Timer<FrameLoader> m_checkTimer;
265 274
266 bool m_didAccessInitialDocument; 275 bool m_didAccessInitialDocument;
267 Timer<FrameLoader> m_didAccessInitialDocumentTimer; 276 Timer<FrameLoader> m_didAccessInitialDocumentTimer;
268 277
269 SandboxFlags m_forcedSandboxFlags; 278 SandboxFlags m_forcedSandboxFlags;
270 }; 279 };
271 280
272 } // namespace blink 281 } // namespace blink
273 282
274 #endif // FrameLoader_h 283 #endif // FrameLoader_h
OLDNEW
« no previous file with comments | « no previous file | Source/core/loader/FrameLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698