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

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

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
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 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 return 0; 54 return 0;
55 55
56 LocalFrame* ownerFrame = frame->tree().parent(); 56 LocalFrame* ownerFrame = frame->tree().parent();
57 if (!ownerFrame) 57 if (!ownerFrame)
58 ownerFrame = frame->loader().opener(); 58 ownerFrame = frame->loader().opener();
59 if (!ownerFrame) 59 if (!ownerFrame)
60 return 0; 60 return 0;
61 return ownerFrame->document(); 61 return ownerFrame->document();
62 } 62 }
63 63
64 DocumentInit::DocumentInit(const KURL& url, LocalFrame* frame, WeakPtr<Document> contextDocument, HTMLImportsController* importsController) 64 DocumentInit::DocumentInit(const KURL& url, LocalFrame* frame, WeakPtrWillBeRawP tr<Document> contextDocument, HTMLImportsController* importsController)
65 : m_url(url) 65 : m_url(url)
66 , m_frame(frame) 66 , m_frame(frame)
67 , m_parent(parentDocument(frame)) 67 , m_parent(parentDocument(frame))
68 , m_owner(ownerDocument(frame)) 68 , m_owner(ownerDocument(frame))
69 , m_contextDocument(contextDocument) 69 , m_contextDocument(contextDocument)
70 , m_importsController(importsController) 70 , m_importsController(importsController)
71 , m_createNewRegistrationContext(false) 71 , m_createNewRegistrationContext(false)
72 { 72 {
73 } 73 }
74 74
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 { 143 {
144 if (!document->isHTMLDocument() && !document->isXHTMLDocument()) 144 if (!document->isHTMLDocument() && !document->isXHTMLDocument())
145 return nullptr; 145 return nullptr;
146 146
147 if (m_createNewRegistrationContext) 147 if (m_createNewRegistrationContext)
148 return CustomElementRegistrationContext::create(); 148 return CustomElementRegistrationContext::create();
149 149
150 return m_registrationContext.get(); 150 return m_registrationContext.get();
151 } 151 }
152 152
153 WeakPtr<Document> DocumentInit::contextDocument() const 153 WeakPtrWillBeRawPtr<Document> DocumentInit::contextDocument() const
154 { 154 {
155 return m_contextDocument; 155 return m_contextDocument;
156 } 156 }
157 157
158 DocumentInit DocumentInit::fromContext(WeakPtr<Document> contextDocument, const KURL& url) 158 DocumentInit DocumentInit::fromContext(WeakPtrWillBeRawPtr<Document> contextDocu ment, const KURL& url)
159 { 159 {
160 return DocumentInit(url, 0, contextDocument, 0); 160 return DocumentInit(url, 0, contextDocument, 0);
161 } 161 }
162 162
163 } // namespace WebCore 163 } // namespace WebCore
164 164
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698