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

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

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 | « Source/core/loader/FrameLoader.h ('k') | Source/core/loader/HistoryItem.h » ('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, 2010, 2011 Apple Inc. All rights reserv ed. 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv ed.
3 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 3 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
4 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 4 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
5 * Copyright (C) 2008 Alp Toker <alp@atoker.com> 5 * Copyright (C) 2008 Alp Toker <alp@atoker.com>
6 * Copyright (C) Research In Motion Limited 2009. All rights reserved. 6 * Copyright (C) Research In Motion Limited 2009. All rights reserved.
7 * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com> 7 * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com>
8 * Copyright (C) 2011 Google Inc. All rights reserved. 8 * Copyright (C) 2011 Google Inc. All rights reserved.
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 // Verify that this FrameLoader has been detached. 130 // Verify that this FrameLoader has been detached.
131 ASSERT(!m_progressTracker); 131 ASSERT(!m_progressTracker);
132 } 132 }
133 133
134 void FrameLoader::trace(Visitor* visitor) 134 void FrameLoader::trace(Visitor* visitor)
135 { 135 {
136 visitor->trace(m_frame); 136 visitor->trace(m_frame);
137 visitor->trace(m_mixedContentChecker); 137 visitor->trace(m_mixedContentChecker);
138 visitor->trace(m_progressTracker); 138 visitor->trace(m_progressTracker);
139 visitor->trace(m_fetchContext); 139 visitor->trace(m_fetchContext);
140 visitor->trace(m_currentItem);
141 visitor->trace(m_provisionalItem);
142 visitor->trace(m_deferredHistoryLoad);
140 } 143 }
141 144
142 void FrameLoader::init() 145 void FrameLoader::init()
143 { 146 {
144 ResourceRequest initialRequest(KURL(ParsedURLString, emptyString())); 147 ResourceRequest initialRequest(KURL(ParsedURLString, emptyString()));
145 initialRequest.setRequestContext(WebURLRequest::RequestContextInternal); 148 initialRequest.setRequestContext(WebURLRequest::RequestContextInternal);
146 initialRequest.setFrameType(m_frame->isMainFrame() ? WebURLRequest::FrameTyp eTopLevel : WebURLRequest::FrameTypeNested); 149 initialRequest.setFrameType(m_frame->isMainFrame() ? WebURLRequest::FrameTyp eTopLevel : WebURLRequest::FrameTypeNested);
147 m_provisionalDocumentLoader = client()->createDocumentLoader(m_frame, initia lRequest, SubstituteData()); 150 m_provisionalDocumentLoader = client()->createDocumentLoader(m_frame, initia lRequest, SubstituteData());
148 m_provisionalDocumentLoader->startLoadingMainResource(); 151 m_provisionalDocumentLoader->startLoadingMainResource();
149 m_frame->document()->cancelParsing(); 152 m_frame->document()->cancelParsing();
(...skipping 1292 matching lines...) Expand 10 before | Expand all | Expand 10 after
1442 // FIXME: We need a way to propagate sandbox flags to out-of-process frames. 1445 // FIXME: We need a way to propagate sandbox flags to out-of-process frames.
1443 Frame* parentFrame = m_frame->tree().parent(); 1446 Frame* parentFrame = m_frame->tree().parent();
1444 if (parentFrame && parentFrame->isLocalFrame()) 1447 if (parentFrame && parentFrame->isLocalFrame())
1445 flags |= toLocalFrame(parentFrame)->document()->sandboxFlags(); 1448 flags |= toLocalFrame(parentFrame)->document()->sandboxFlags();
1446 if (FrameOwner* frameOwner = m_frame->owner()) 1449 if (FrameOwner* frameOwner = m_frame->owner())
1447 flags |= frameOwner->sandboxFlags(); 1450 flags |= frameOwner->sandboxFlags();
1448 return flags; 1451 return flags;
1449 } 1452 }
1450 1453
1451 } // namespace blink 1454 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/loader/FrameLoader.h ('k') | Source/core/loader/HistoryItem.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698