OLD | NEW |
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 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
97 bool DocumentInit::shouldTreatURLAsSrcdocDocument() const | 97 bool DocumentInit::shouldTreatURLAsSrcdocDocument() const |
98 { | 98 { |
99 return m_parent && m_frame->loader().shouldTreatURLAsSrcdocDocument(m_url); | 99 return m_parent && m_frame->loader().shouldTreatURLAsSrcdocDocument(m_url); |
100 } | 100 } |
101 | 101 |
102 LocalFrame* DocumentInit::frameForSecurityContext() const | 102 LocalFrame* DocumentInit::frameForSecurityContext() const |
103 { | 103 { |
104 if (m_frame) | 104 if (m_frame) |
105 return m_frame; | 105 return m_frame; |
106 if (m_importsController) | 106 if (m_importsController) |
107 return m_importsController->frame(); | 107 return m_importsController->master()->frame(); |
108 return 0; | 108 return 0; |
109 } | 109 } |
110 | 110 |
111 SandboxFlags DocumentInit::sandboxFlags() const | 111 SandboxFlags DocumentInit::sandboxFlags() const |
112 { | 112 { |
113 ASSERT(frameForSecurityContext()); | 113 ASSERT(frameForSecurityContext()); |
114 return frameForSecurityContext()->loader().effectiveSandboxFlags(); | 114 return frameForSecurityContext()->loader().effectiveSandboxFlags(); |
115 } | 115 } |
116 | 116 |
117 Settings* DocumentInit::settings() const | 117 Settings* DocumentInit::settings() const |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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(WeakPtr<Document> contextDocument, 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 |
OLD | NEW |