Index: Source/core/frame/DOMWindow.cpp |
=================================================================== |
--- Source/core/frame/DOMWindow.cpp (revision 169809) |
+++ Source/core/frame/DOMWindow.cpp (working copy) |
@@ -1217,7 +1217,7 @@ |
const AtomicString& DOMWindow::name() const |
{ |
- if (!m_frame) |
+ if (!isCurrentlyDisplayedInFrame()) |
return nullAtom; |
return m_frame->tree().name(); |
@@ -1225,10 +1225,11 @@ |
void DOMWindow::setName(const AtomicString& name) |
{ |
- if (!m_frame) |
+ if (!isCurrentlyDisplayedInFrame()) |
return; |
m_frame->tree().setName(name); |
+ ASSERT(m_frame->loader().client()); |
m_frame->loader().client()->didChangeName(name); |
} |