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

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

Issue 1290683003: Remove WeakPtrs from DocumentTiming/DocumentLoadTiming (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: WeakPtrWillBeRawPtr<Document>(nullptr) => nullptr Created 5 years, 4 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/DocumentLoader.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/loader/DocumentLoader.cpp
diff --git a/Source/core/loader/DocumentLoader.cpp b/Source/core/loader/DocumentLoader.cpp
index 2a6f06e9c37c0dbcb555aeb230b45667955aba8f..e82b92e8c4206f27da928123704ca1075493f67a 100644
--- a/Source/core/loader/DocumentLoader.cpp
+++ b/Source/core/loader/DocumentLoader.cpp
@@ -91,10 +91,7 @@ DocumentLoader::DocumentLoader(LocalFrame* frame, const ResourceRequest& req, co
, m_isClientRedirect(false)
, m_replacesCurrentHistoryItem(false)
, m_navigationType(NavigationTypeOther)
-#if !ENABLE(OILPAN)
- , m_weakFactory(this)
-#endif
- , m_documentLoadTiming(this->weakReference())
+ , m_documentLoadTiming(*this)
, m_timeOfLastDataReceived(0.0)
, m_applicationCacheHost(ApplicationCacheHost::create(this))
, m_state(NotStarted)
@@ -443,15 +440,6 @@ bool DocumentLoader::shouldContinueForResponse() const
return true;
}
-WeakPtrWillBeRawPtr<DocumentLoader> DocumentLoader::weakReference()
-{
-#if ENABLE(OILPAN)
- return this;
-#else
- return m_weakFactory.createWeakPtr();
-#endif
-}
-
void DocumentLoader::cancelLoadAfterXFrameOptionsOrCSPDenied(const ResourceResponse& response)
{
InspectorInstrumentation::continueAfterXFrameOptionsDenied(m_frame, this, mainResourceIdentifier(), response);
« no previous file with comments | « Source/core/loader/DocumentLoader.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698