Index: Source/core/dom/Document.h |
diff --git a/Source/core/dom/Document.h b/Source/core/dom/Document.h |
index 050ff54baefb140ccefe80c51cb908c3d5a4a917..dd4f66d0f7c5c1a48694724cd43f60101f8787ab 100644 |
--- a/Source/core/dom/Document.h |
+++ b/Source/core/dom/Document.h |
@@ -832,7 +832,7 @@ public: |
Document* parentDocument() const; |
Document& topDocument() const; |
- WeakPtr<Document> contextDocument(); |
+ WeakPtrWillBeRawPtr<Document> contextDocument(); |
ScriptRunner* scriptRunner() { return m_scriptRunner.get(); } |
@@ -1341,9 +1341,10 @@ private: |
RenderView* m_renderView; |
- // FIXME: Oilpan: We should use a real weak pointer here. |
+#if !ENABLE(OILPAN) |
WeakPtrFactory<Document> m_weakFactory; |
- WeakPtr<Document> m_contextDocument; |
+#endif |
+ WeakPtrWillBeWeakMember<Document> m_contextDocument; |
bool m_hasFullscreenElementStack; // For early return in FullscreenElementStack::fromIfExists() |