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

Unified Diff: Source/core/dom/Document.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/dom/Document.h ('k') | Source/core/dom/DocumentTiming.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/dom/Document.cpp
diff --git a/Source/core/dom/Document.cpp b/Source/core/dom/Document.cpp
index b372b48cc4a8f948711bccd04133aaa8db6e6f16..26b33075eb8218667929384816530a6a3338dc64 100644
--- a/Source/core/dom/Document.cpp
+++ b/Source/core/dom/Document.cpp
@@ -421,7 +421,7 @@ Document::Document(const DocumentInit& initializer, DocumentClassFlags documentC
, m_loadEventDelayCount(0)
, m_loadEventDelayTimer(this, &Document::loadEventDelayTimerFired)
, m_pluginLoadingTimer(this, &Document::pluginLoadingTimerFired)
- , m_documentTiming(this->weakReference())
+ , m_documentTiming(*this)
, m_writeRecursionIsTooDeep(false)
, m_writeRecursionDepth(0)
, m_taskRunner(MainThreadTaskRunner::create(this))
@@ -4394,18 +4394,13 @@ WeakPtrWillBeRawPtr<Document> Document::contextDocument()
if (m_contextDocument)
return m_contextDocument;
if (m_frame) {
- return weakReference();
- }
- return WeakPtrWillBeRawPtr<Document>(nullptr);
-}
-
-WeakPtrWillBeRawPtr<Document> Document::weakReference()
-{
#if ENABLE(OILPAN)
- return this;
+ return this;
#else
- return m_weakFactory.createWeakPtr();
+ return m_weakFactory.createWeakPtr();
#endif
+ }
+ return nullptr;
}
PassRefPtrWillBeRawPtr<Attr> Document::createAttribute(const AtomicString& name, ExceptionState& exceptionState)
« no previous file with comments | « Source/core/dom/Document.h ('k') | Source/core/dom/DocumentTiming.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698