Index: Source/core/dom/Document.cpp |
diff --git a/Source/core/dom/Document.cpp b/Source/core/dom/Document.cpp |
index b372b48cc4a8f948711bccd04133aaa8db6e6f16..b0cf293e62534a4c76747129f78fc1f54f0e2f90 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 WeakPtrWillBeRawPtr<Document>(nullptr); |
dcheng
2015/08/18 19:25:32
I think nullptr by itself should work here.
|
} |
PassRefPtrWillBeRawPtr<Attr> Document::createAttribute(const AtomicString& name, ExceptionState& exceptionState) |