Chromium Code Reviews| Index: Source/core/frame/LocalDOMWindow.cpp |
| diff --git a/Source/core/frame/LocalDOMWindow.cpp b/Source/core/frame/LocalDOMWindow.cpp |
| index fcbedc571a32e4330605e33fe2ac5c88734d7b2e..80f0a386bc1a4ee58c73934e9478e0c70290ae2b 100644 |
| --- a/Source/core/frame/LocalDOMWindow.cpp |
| +++ b/Source/core/frame/LocalDOMWindow.cpp |
| @@ -733,7 +733,7 @@ DOMSelection* LocalDOMWindow::getSelection() |
| Element* LocalDOMWindow::frameElement() const |
| { |
| - if (!frame()) |
| + if (!frame() || (frame()->owner() && !frame()->owner()->isLocal())) |
|
alexmos
2015/04/30 20:45:26
The comment about the binding security check below
dcheng
2015/04/30 20:58:51
I'd prefer to just hit the assert below. deprecate
alexmos
2015/04/30 21:12:58
Sounds good -- done.
|
| return nullptr; |
| // The bindings security check should ensure we're same origin... |