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

Side by Side Diff: Source/core/dom/DocumentInit.h

Issue 304323010: Oilpan: have DocumentInit use transition types throughout. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Add WeakPtrWillBeMember transition type Created 6 years, 6 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 unified diff | Download patch
« no previous file with comments | « Source/core/dom/Document.cpp ('k') | Source/core/dom/DocumentInit.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2001 Dirk Mueller (mueller@kde.org) 4 * (C) 2001 Dirk Mueller (mueller@kde.org)
5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org) 5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org)
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Inc. All r ights reserved. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Inc. All r ights reserved.
7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
8 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) 8 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
9 * Copyright (C) 2013 Google Inc. All rights reserved. 9 * Copyright (C) 2013 Google Inc. All rights reserved.
10 * 10 *
(...skipping 29 matching lines...) Expand all
40 40
41 class CustomElementRegistrationContext; 41 class CustomElementRegistrationContext;
42 class Document; 42 class Document;
43 class LocalFrame; 43 class LocalFrame;
44 class HTMLImportsController; 44 class HTMLImportsController;
45 class Settings; 45 class Settings;
46 46
47 class DocumentInit FINAL { 47 class DocumentInit FINAL {
48 STACK_ALLOCATED(); 48 STACK_ALLOCATED();
49 public: 49 public:
50 explicit DocumentInit(const KURL& = KURL(), LocalFrame* = 0, WeakPtr<Documen t> = WeakPtr<Document>(), HTMLImportsController* = 0); 50 explicit DocumentInit(const KURL& = KURL(), LocalFrame* = 0, WeakPtrWillBeRa wPtr<Document> = nullptr, HTMLImportsController* = 0);
tkent 2014/06/02 07:56:07 WeakPtr(std::nullptr_t) is necessary because RawPt
sof 2014/06/02 08:01:34 Yes, exactly so. As RawPtr() (for the Oilpan case)
51 DocumentInit(const DocumentInit&); 51 DocumentInit(const DocumentInit&);
52 ~DocumentInit(); 52 ~DocumentInit();
53 53
54 const KURL& url() const { return m_url; } 54 const KURL& url() const { return m_url; }
55 LocalFrame* frame() const { return m_frame; } 55 LocalFrame* frame() const { return m_frame; }
56 HTMLImportsController* importsController() const { return m_importsControlle r; } 56 HTMLImportsController* importsController() const { return m_importsControlle r; }
57 57
58 bool hasSecurityContext() const { return frameForSecurityContext(); } 58 bool hasSecurityContext() const { return frameForSecurityContext(); }
59 bool shouldTreatURLAsSrcdocDocument() const; 59 bool shouldTreatURLAsSrcdocDocument() const;
60 bool shouldSetURL() const; 60 bool shouldSetURL() const;
61 bool isSeamlessAllowedFor(Document* child) const; 61 bool isSeamlessAllowedFor(Document* child) const;
62 SandboxFlags sandboxFlags() const; 62 SandboxFlags sandboxFlags() const;
63 63
64 Document* parent() const { return m_parent.get(); } 64 Document* parent() const { return m_parent.get(); }
65 Document* owner() const { return m_owner.get(); } 65 Document* owner() const { return m_owner.get(); }
66 KURL parentBaseURL() const; 66 KURL parentBaseURL() const;
67 LocalFrame* ownerFrame() const; 67 LocalFrame* ownerFrame() const;
68 Settings* settings() const; 68 Settings* settings() const;
69 69
70 DocumentInit& withRegistrationContext(CustomElementRegistrationContext*); 70 DocumentInit& withRegistrationContext(CustomElementRegistrationContext*);
71 DocumentInit& withNewRegistrationContext(); 71 DocumentInit& withNewRegistrationContext();
72 PassRefPtrWillBeRawPtr<CustomElementRegistrationContext> registrationContext (Document*) const; 72 PassRefPtrWillBeRawPtr<CustomElementRegistrationContext> registrationContext (Document*) const;
73 WeakPtr<Document> contextDocument() const; 73 WeakPtrWillBeRawPtr<Document> contextDocument() const;
74 74
75 static DocumentInit fromContext(WeakPtr<Document> contextDocument, const KUR L& = KURL()); 75 static DocumentInit fromContext(WeakPtrWillBeRawPtr<Document> contextDocumen t, const KURL& = KURL());
76 76
77 private: 77 private:
78 LocalFrame* frameForSecurityContext() const; 78 LocalFrame* frameForSecurityContext() const;
79 79
80 KURL m_url; 80 KURL m_url;
81 LocalFrame* m_frame; 81 LocalFrame* m_frame;
82 RefPtr<Document> m_parent; 82 RefPtrWillBeMember<Document> m_parent;
83 RefPtr<Document> m_owner; 83 RefPtrWillBeMember<Document> m_owner;
84 WeakPtr<Document> m_contextDocument; 84 WeakPtrWillBeMember<Document> m_contextDocument;
85 RawPtrWillBeMember<HTMLImportsController> m_importsController; 85 RawPtrWillBeMember<HTMLImportsController> m_importsController;
86 RefPtrWillBeMember<CustomElementRegistrationContext> m_registrationContext; 86 RefPtrWillBeMember<CustomElementRegistrationContext> m_registrationContext;
87 bool m_createNewRegistrationContext; 87 bool m_createNewRegistrationContext;
88 }; 88 };
89 89
90 } // namespace WebCore 90 } // namespace WebCore
91 91
92 #endif // DocumentInit_h 92 #endif // DocumentInit_h
OLDNEW
« no previous file with comments | « Source/core/dom/Document.cpp ('k') | Source/core/dom/DocumentInit.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698