| OLD | NEW |
| 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 241 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 252 } | 252 } |
| 253 | 253 |
| 254 if (!document().securityOrigin()->canDisplay(url)) { | 254 if (!document().securityOrigin()->canDisplay(url)) { |
| 255 FrameLoader::reportLocalLoadFailed(parentFrame.get(), url.string()); | 255 FrameLoader::reportLocalLoadFailed(parentFrame.get(), url.string()); |
| 256 return false; | 256 return false; |
| 257 } | 257 } |
| 258 | 258 |
| 259 if (!SubframeLoadingDisabler::canLoadFrame(*this)) | 259 if (!SubframeLoadingDisabler::canLoadFrame(*this)) |
| 260 return false; | 260 return false; |
| 261 | 261 |
| 262 return parentFrame->loader().client()->createFrame(url, frameName, this, sho
uldCheckContentSecurityPolicy); | 262 return parentFrame->loader().client()->createFrame(url, frameName, this, sho
uldCheckContentSecurityPolicy, m_sandboxFlags); |
| 263 } | 263 } |
| 264 | 264 |
| 265 void HTMLFrameOwnerElement::trace(Visitor* visitor) | 265 void HTMLFrameOwnerElement::trace(Visitor* visitor) |
| 266 { | 266 { |
| 267 visitor->trace(m_contentFrame); | 267 visitor->trace(m_contentFrame); |
| 268 visitor->trace(m_widget); | 268 visitor->trace(m_widget); |
| 269 HTMLElement::trace(visitor); | 269 HTMLElement::trace(visitor); |
| 270 FrameOwner::trace(visitor); | 270 FrameOwner::trace(visitor); |
| 271 } | 271 } |
| 272 | 272 |
| 273 | 273 |
| 274 } // namespace blink | 274 } // namespace blink |
| OLD | NEW |