| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2008, 2010 Apple Inc. All rights reserved. | 2 * Copyright (C) 2008, 2010 Apple Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * | 7 * |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 230 // Note: We call DOMWindow::setLocation directly here because replace() alwa
ys operates on the current frame. | 230 // Note: We call DOMWindow::setLocation directly here because replace() alwa
ys operates on the current frame. |
| 231 m_frame->domWindow()->setLocation(url, activeWindow, firstWindow, LockHistor
yAndBackForwardList); | 231 m_frame->domWindow()->setLocation(url, activeWindow, firstWindow, LockHistor
yAndBackForwardList); |
| 232 } | 232 } |
| 233 | 233 |
| 234 void Location::reload(DOMWindow* activeWindow) | 234 void Location::reload(DOMWindow* activeWindow) |
| 235 { | 235 { |
| 236 if (!m_frame) | 236 if (!m_frame) |
| 237 return; | 237 return; |
| 238 if (protocolIsJavaScript(m_frame->document()->url())) | 238 if (protocolIsJavaScript(m_frame->document()->url())) |
| 239 return; | 239 return; |
| 240 m_frame->navigationScheduler()->scheduleRefresh(); | 240 m_frame->navigationScheduler().scheduleRefresh(); |
| 241 } | 241 } |
| 242 | 242 |
| 243 void Location::setLocation(const String& url, DOMWindow* activeWindow, DOMWindow
* firstWindow) | 243 void Location::setLocation(const String& url, DOMWindow* activeWindow, DOMWindow
* firstWindow) |
| 244 { | 244 { |
| 245 ASSERT(m_frame); | 245 ASSERT(m_frame); |
| 246 // We call findFrameForNavigation to handle the case of a seamless iframe co
rrectly. | 246 // We call findFrameForNavigation to handle the case of a seamless iframe co
rrectly. |
| 247 Frame* frame = m_frame->loader()->findFrameForNavigation(String(), activeWin
dow->document()); | 247 Frame* frame = m_frame->loader()->findFrameForNavigation(String(), activeWin
dow->document()); |
| 248 if (!frame) | 248 if (!frame) |
| 249 return; | 249 return; |
| 250 frame->domWindow()->setLocation(url, activeWindow, firstWindow); | 250 frame->domWindow()->setLocation(url, activeWindow, firstWindow); |
| 251 } | 251 } |
| 252 | 252 |
| 253 } // namespace WebCore | 253 } // namespace WebCore |
| OLD | NEW |