| Index: third_party/WebKit/Source/core/dom/DocumentInit.h
|
| diff --git a/third_party/WebKit/Source/core/dom/DocumentInit.h b/third_party/WebKit/Source/core/dom/DocumentInit.h
|
| index 9ff2340463ef5472b259544c4234eb7517197e5a..11e259b9d2333fedd1fc1c533bc4ab3ef21690c0 100644
|
| --- a/third_party/WebKit/Source/core/dom/DocumentInit.h
|
| +++ b/third_party/WebKit/Source/core/dom/DocumentInit.h
|
| @@ -48,7 +48,7 @@ class Settings;
|
| class CORE_EXPORT DocumentInit final {
|
| STACK_ALLOCATED();
|
| public:
|
| - explicit DocumentInit(const KURL& = KURL(), LocalFrame* = 0, WeakPtrWillBeRawPtr<Document> = nullptr, HTMLImportsController* = 0);
|
| + explicit DocumentInit(const KURL& = KURL(), LocalFrame* = 0, RawPtr<Document> = nullptr, HTMLImportsController* = 0);
|
| DocumentInit(const DocumentInit&);
|
| ~DocumentInit();
|
|
|
| @@ -77,21 +77,21 @@ public:
|
| DocumentInit& withRegistrationContext(CustomElementRegistrationContext*);
|
| DocumentInit& withNewRegistrationContext();
|
| DocumentInit& withoutInheritingSecurityOrigin();
|
| - PassRefPtrWillBeRawPtr<CustomElementRegistrationContext> registrationContext(Document*) const;
|
| - WeakPtrWillBeRawPtr<Document> contextDocument() const;
|
| + RawPtr<CustomElementRegistrationContext> registrationContext(Document*) const;
|
| + RawPtr<Document> contextDocument() const;
|
|
|
| - static DocumentInit fromContext(WeakPtrWillBeRawPtr<Document> contextDocument, const KURL& = KURL());
|
| + static DocumentInit fromContext(RawPtr<Document> contextDocument, const KURL& = KURL());
|
|
|
| private:
|
| LocalFrame* frameForSecurityContext() const;
|
|
|
| KURL m_url;
|
| - RawPtrWillBeMember<LocalFrame> m_frame;
|
| - RefPtrWillBeMember<Document> m_parent;
|
| - RefPtrWillBeMember<Document> m_owner;
|
| - WeakPtrWillBeMember<Document> m_contextDocument;
|
| - RawPtrWillBeMember<HTMLImportsController> m_importsController;
|
| - RefPtrWillBeMember<CustomElementRegistrationContext> m_registrationContext;
|
| + Member<LocalFrame> m_frame;
|
| + Member<Document> m_parent;
|
| + Member<Document> m_owner;
|
| + Member<Document> m_contextDocument;
|
| + Member<HTMLImportsController> m_importsController;
|
| + Member<CustomElementRegistrationContext> m_registrationContext;
|
| bool m_createNewRegistrationContext;
|
|
|
| // In some rare cases, we'll re-use a LocalDOMWindow for a new Document. For example,
|
|
|