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

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

Issue 33353003: Have Frame::tree() return a reference (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase on master Created 7 years, 2 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/dom/Document.cpp ('k') | Source/core/dom/FullscreenElementStack.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 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 { 88 {
89 ASSERT(frameForSecurityContext()); 89 ASSERT(frameForSecurityContext());
90 return frameForSecurityContext()->settings(); 90 return frameForSecurityContext()->settings();
91 } 91 }
92 92
93 Frame* DocumentInit::ownerFrame() const 93 Frame* DocumentInit::ownerFrame() const
94 { 94 {
95 if (!m_frame) 95 if (!m_frame)
96 return 0; 96 return 0;
97 97
98 Frame* ownerFrame = m_frame->tree()->parent(); 98 Frame* ownerFrame = m_frame->tree().parent();
99 if (!ownerFrame) 99 if (!ownerFrame)
100 ownerFrame = m_frame->loader()->opener(); 100 ownerFrame = m_frame->loader()->opener();
101 return ownerFrame; 101 return ownerFrame;
102 } 102 }
103 103
104 DocumentInit& DocumentInit::withRegistrationContext(CustomElementRegistrationCon text* registrationContext) 104 DocumentInit& DocumentInit::withRegistrationContext(CustomElementRegistrationCon text* registrationContext)
105 { 105 {
106 ASSERT(!m_registrationContext); 106 ASSERT(!m_registrationContext);
107 m_registrationContext = registrationContext; 107 m_registrationContext = registrationContext;
108 return *this; 108 return *this;
(...skipping 18 matching lines...) Expand all
127 return m_contextDocument; 127 return m_contextDocument;
128 } 128 }
129 129
130 DocumentInit DocumentInit::fromContext(WeakPtr<Document> contextDocument, const KURL& url) 130 DocumentInit DocumentInit::fromContext(WeakPtr<Document> contextDocument, const KURL& url)
131 { 131 {
132 return DocumentInit(url, 0, contextDocument, 0); 132 return DocumentInit(url, 0, contextDocument, 0);
133 } 133 }
134 134
135 } // namespace WebCore 135 } // namespace WebCore
136 136
OLDNEW
« no previous file with comments | « Source/core/dom/Document.cpp ('k') | Source/core/dom/FullscreenElementStack.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698