Index: Source/core/frame/DOMWindow.cpp |
diff --git a/Source/core/frame/DOMWindow.cpp b/Source/core/frame/DOMWindow.cpp |
index baf8eceda6e3b61a156b2385f53baa8e1ac93927..a9c7d4dbf82096893986cf498a685d28b312a72e 100644 |
--- a/Source/core/frame/DOMWindow.cpp |
+++ b/Source/core/frame/DOMWindow.cpp |
@@ -1189,7 +1189,7 @@ unsigned DOMWindow::length() const |
const AtomicString& DOMWindow::name() const |
{ |
- if (!m_frame) |
+ if (!isCurrentlyDisplayedInFrame()) |
return nullAtom; |
return m_frame->tree().name(); |
@@ -1197,10 +1197,11 @@ const AtomicString& DOMWindow::name() const |
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); |
} |