| Index: Source/core/frame/Location.cpp
|
| diff --git a/Source/core/frame/Location.cpp b/Source/core/frame/Location.cpp
|
| index 023edca250dada2eaa939ddaa91d73aa7c5ec5bf..534771789309d5acbbf0c39d83a289cbc3e1749f 100644
|
| --- a/Source/core/frame/Location.cpp
|
| +++ b/Source/core/frame/Location.cpp
|
| @@ -234,7 +234,9 @@ void Location::replace(LocalDOMWindow* callingWindow, LocalDOMWindow* enteredWin
|
| if (!m_frame)
|
| return;
|
| // Note: We call LocalDOMWindow::setLocation directly here because replace() always operates on the current frame.
|
| - m_frame->domWindow()->setLocation(url, callingWindow, enteredWindow, LockHistoryAndBackForwardList);
|
| + // FIXME: setLocation() probably belongs on DOMWindow, since you can trigger
|
| + // navigations across different origins.
|
| + m_frame->localDOMWindow()->setLocation(url, callingWindow, enteredWindow, LockHistoryAndBackForwardList);
|
| }
|
|
|
| void Location::reload(LocalDOMWindow* callingWindow)
|
| @@ -252,7 +254,9 @@ void Location::setLocation(const String& url, LocalDOMWindow* callingWindow, Loc
|
| LocalFrame* frame = m_frame->loader().findFrameForNavigation(nullAtom, callingWindow->document());
|
| if (!frame)
|
| return;
|
| - frame->domWindow()->setLocation(url, callingWindow, enteredWindow);
|
| + // FIXME: setLocation() probably belongs on DOMWindow, since you can trigger
|
| + // navigations across different origins.
|
| + frame->localDOMWindow()->setLocation(url, callingWindow, enteredWindow);
|
| }
|
|
|
| } // namespace blink
|
|
|