Index: Source/core/dom/DocumentInit.h |
diff --git a/Source/core/dom/DocumentInit.h b/Source/core/dom/DocumentInit.h |
index ffe4e9293cacc1d16874a681048dbddc7b441bdf..bb26239e7bef4ea909c8b55be3f33017f9fd784e 100644 |
--- a/Source/core/dom/DocumentInit.h |
+++ b/Source/core/dom/DocumentInit.h |
@@ -47,7 +47,7 @@ class Settings; |
class DocumentInit FINAL { |
STACK_ALLOCATED(); |
public: |
- explicit DocumentInit(const KURL& = KURL(), LocalFrame* = 0, WeakPtr<Document> = WeakPtr<Document>(), HTMLImportsController* = 0); |
+ explicit DocumentInit(const KURL& = KURL(), LocalFrame* = 0, WeakPtrWillBeRawPtr<Document> = nullptr, HTMLImportsController* = 0); |
DocumentInit(const DocumentInit&); |
~DocumentInit(); |
@@ -70,18 +70,22 @@ public: |
DocumentInit& withRegistrationContext(CustomElementRegistrationContext*); |
DocumentInit& withNewRegistrationContext(); |
PassRefPtrWillBeRawPtr<CustomElementRegistrationContext> registrationContext(Document*) const; |
- WeakPtr<Document> contextDocument() const; |
+ WeakPtrWillBeRawPtr<Document> contextDocument() const; |
- static DocumentInit fromContext(WeakPtr<Document> contextDocument, const KURL& = KURL()); |
+ static DocumentInit fromContext(WeakPtrWillBeRawPtr<Document> contextDocument, const KURL& = KURL()); |
private: |
LocalFrame* frameForSecurityContext() const; |
KURL m_url; |
LocalFrame* m_frame; |
- RefPtr<Document> m_parent; |
- RefPtr<Document> m_owner; |
+ RefPtrWillBeMember<Document> m_parent; |
+ RefPtrWillBeMember<Document> m_owner; |
+#if ENABLE(OILPAN) |
+ Member<Document> m_contextDocument; |
+#else |
WeakPtr<Document> m_contextDocument; |
haraken
2014/06/02 07:17:03
Can we introduce WeakPtrWillBeMember?
sof
2014/06/02 07:20:06
I considered it too specialized & a one-off occurr
haraken
2014/06/02 07:26:47
Either is fine, but I might to use it in modules/w
sof
2014/06/02 07:31:04
Thanks, let's add it here then :)
|
+#endif |
RawPtrWillBeMember<HTMLImportsController> m_importsController; |
RefPtrWillBeMember<CustomElementRegistrationContext> m_registrationContext; |
bool m_createNewRegistrationContext; |