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

Unified Diff: Source/core/loader/FrameLoader.cpp

Issue 1198963003: [NOCOMMIT] Apply cl/1194003004 on cl/1124153003 PS 10 (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/loader/FrameLoader.h ('k') | Source/core/loader/FrameLoaderClient.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/loader/FrameLoader.cpp
diff --git a/Source/core/loader/FrameLoader.cpp b/Source/core/loader/FrameLoader.cpp
index d7b20f4f18b606af4cff711c37b1c4b563e43ff9..4defc349a8b5e89981a478c2b6d9eae55a8b3180 100644
--- a/Source/core/loader/FrameLoader.cpp
+++ b/Source/core/loader/FrameLoader.cpp
@@ -179,6 +179,9 @@ DEFINE_TRACE(FrameLoader)
{
visitor->trace(m_frame);
visitor->trace(m_progressTracker);
+ visitor->trace(m_documentLoader);
+ visitor->trace(m_provisionalDocumentLoader);
+ visitor->trace(m_policyDocumentLoader);
visitor->trace(m_currentItem);
visitor->trace(m_provisionalItem);
visitor->trace(m_deferredHistoryLoad);
@@ -315,7 +318,7 @@ void FrameLoader::replaceDocumentWhileExecutingJavaScriptURL(const String& sourc
// DocumentLoader::replaceDocumentWhileExecutingJavaScriptURL can cause the DocumentLoader to get deref'ed and possible destroyed,
// so protect it with a RefPtr.
- RefPtr<DocumentLoader> documentLoader(m_frame->document()->loader());
+ RefPtrWillBeRawPtr<DocumentLoader> documentLoader(m_frame->document()->loader());
UseCounter::count(*m_frame->document(), UseCounter::ReplaceDocumentViaJavaScriptURL);
@@ -1009,7 +1012,7 @@ void FrameLoader::notifyIfInitialDocumentAccessed()
bool FrameLoader::prepareForCommit()
{
PluginScriptForbiddenScope forbidPluginDestructorScripting;
- RefPtr<DocumentLoader> pdl = m_provisionalDocumentLoader;
+ RefPtrWillBeRawPtr<DocumentLoader> pdl = m_provisionalDocumentLoader;
if (m_documentLoader) {
client()->dispatchWillClose();
« no previous file with comments | « Source/core/loader/FrameLoader.h ('k') | Source/core/loader/FrameLoaderClient.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698