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

Side by Side Diff: Source/core/html/HTMLFrameOwnerElement.cpp

Issue 838903002: Replicate sandbox flags for OOPIF (Blink part 2) (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@iframe-sandbox-flags-part1
Patch Set: Address Daniel's comments. Move sandbox flags inheritance to FrameLoader::effectiveSandboxFlags(). Created 5 years, 11 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) 2006, 2007, 2009 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2009 Apple Inc. All rights reserved.
3 * 3 *
4 * This library is free software; you can redistribute it and/or 4 * This library is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU Library General Public 5 * modify it under the terms of the GNU Library General Public
6 * License as published by the Free Software Foundation; either 6 * License as published by the Free Software Foundation; either
7 * version 2 of the License, or (at your option) any later version. 7 * version 2 of the License, or (at your option) any later version.
8 * 8 *
9 * This library is distributed in the hope that it will be useful, 9 * This library is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 DOMWindow* HTMLFrameOwnerElement::contentWindow() const 179 DOMWindow* HTMLFrameOwnerElement::contentWindow() const
180 { 180 {
181 return m_contentFrame ? m_contentFrame->domWindow() : 0; 181 return m_contentFrame ? m_contentFrame->domWindow() : 0;
182 } 182 }
183 183
184 void HTMLFrameOwnerElement::setSandboxFlags(SandboxFlags flags) 184 void HTMLFrameOwnerElement::setSandboxFlags(SandboxFlags flags)
185 { 185 {
186 m_sandboxFlags = flags; 186 m_sandboxFlags = flags;
187 } 187 }
188 188
189 SandboxFlags HTMLFrameOwnerElement::sandboxFlags() const
190 {
191 return m_sandboxFlags | document().sandboxFlags();
192 }
193
194 bool HTMLFrameOwnerElement::isKeyboardFocusable() const 189 bool HTMLFrameOwnerElement::isKeyboardFocusable() const
195 { 190 {
196 return m_contentFrame && HTMLElement::isKeyboardFocusable(); 191 return m_contentFrame && HTMLElement::isKeyboardFocusable();
197 } 192 }
198 193
199 void HTMLFrameOwnerElement::dispatchLoad() 194 void HTMLFrameOwnerElement::dispatchLoad()
200 { 195 {
201 dispatchEvent(Event::create(EventTypeNames::load)); 196 dispatchEvent(Event::create(EventTypeNames::load));
202 } 197 }
203 198
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
265 void HTMLFrameOwnerElement::trace(Visitor* visitor) 260 void HTMLFrameOwnerElement::trace(Visitor* visitor)
266 { 261 {
267 visitor->trace(m_contentFrame); 262 visitor->trace(m_contentFrame);
268 visitor->trace(m_widget); 263 visitor->trace(m_widget);
269 HTMLElement::trace(visitor); 264 HTMLElement::trace(visitor);
270 FrameOwner::trace(visitor); 265 FrameOwner::trace(visitor);
271 } 266 }
272 267
273 268
274 } // namespace blink 269 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698