diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-08-21 10:57:44 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-08-21 10:57:44 +0200 |
| commit | 5ef7c8a6a70875d4430752d146bdcb069605d71d (patch) | |
| tree | f6256640b6c46d7da221435803cae65326817ba2 /Source/WebCore/page/Location.cpp | |
| parent | decad929f578d8db641febc8740649ca6c574638 (diff) | |
| download | qtwebkit-5ef7c8a6a70875d4430752d146bdcb069605d71d.tar.gz | |
Imported WebKit commit 356d83016b090995d08ad568f2d2c243aa55e831 (http://svn.webkit.org/repository/webkit/trunk@126147)
New snapshot including various build fixes for newer Qt 5
Diffstat (limited to 'Source/WebCore/page/Location.cpp')
| -rw-r--r-- | Source/WebCore/page/Location.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/WebCore/page/Location.cpp b/Source/WebCore/page/Location.cpp index df6ea8df5..36b35c4de 100644 --- a/Source/WebCore/page/Location.cpp +++ b/Source/WebCore/page/Location.cpp @@ -241,7 +241,7 @@ void Location::replace(const String& url, DOMWindow* activeWindow, DOMWindow* fi if (!m_frame) return; // Note: We call DOMWindow::setLocation directly here because replace() always operates on the current frame. - m_frame->domWindow()->setLocation(url, activeWindow, firstWindow, LockHistoryAndBackForwardList); + m_frame->document()->domWindow()->setLocation(url, activeWindow, firstWindow, LockHistoryAndBackForwardList); } void Location::reload(DOMWindow* activeWindow) @@ -251,8 +251,8 @@ void Location::reload(DOMWindow* activeWindow) // FIXME: It's not clear this cross-origin security check is valuable. // We allow one page to change the location of another. Why block attempts to reload? // Other location operations simply block use of JavaScript URLs cross origin. - DOMWindow* targetWindow = m_frame->domWindow(); - if (!activeWindow->securityOrigin()->canAccess(targetWindow->securityOrigin())) { + DOMWindow* targetWindow = m_frame->document()->domWindow(); + if (!activeWindow->document()->securityOrigin()->canAccess(m_frame->document()->securityOrigin())) { targetWindow->printErrorMessage(targetWindow->crossDomainAccessErrorMessage(activeWindow)); return; } @@ -268,7 +268,7 @@ void Location::setLocation(const String& url, DOMWindow* activeWindow, DOMWindow Frame* frame = m_frame->loader()->findFrameForNavigation(String(), activeWindow->document()); if (!frame) return; - frame->domWindow()->setLocation(url, activeWindow, firstWindow); + frame->document()->domWindow()->setLocation(url, activeWindow, firstWindow); } } // namespace WebCore |