Index: Source/core/frame/Location.cpp |
diff --git a/Source/core/frame/Location.cpp b/Source/core/frame/Location.cpp |
index 663597270001c1870c0985e9ec595b9c1a5849cf..0f82f12150080fb0eecf20a503508345e05bb9df 100644 |
--- a/Source/core/frame/Location.cpp |
+++ b/Source/core/frame/Location.cpp |
@@ -248,12 +248,12 @@ void Location::reload(LocalDOMWindow* callingWindow) |
void Location::setLocation(const String& url, LocalDOMWindow* callingWindow, LocalDOMWindow* enteredWindow) |
{ |
ASSERT(m_frame); |
- LocalFrame* frame = m_frame->loader().findFrameForNavigation(nullAtom, callingWindow->document()); |
- if (!frame) |
+ Frame* frame = m_frame->findFrameForNavigation(nullAtom, *callingWindow->frame()); |
+ if (!frame || !frame->isLocalFrame()) |
return; |
// FIXME: setLocation() probably belongs on DOMWindow, since you can trigger |
// navigations across different origins. |
- frame->localDOMWindow()->setLocation(url, callingWindow, enteredWindow); |
+ toLocalFrame(frame)->localDOMWindow()->setLocation(url, callingWindow, enteredWindow); |
} |
} // namespace blink |