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 225 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
236 return; | 236 return; |
237 if (protocolIsJavaScript(m_frame->document()->url())) | 237 if (protocolIsJavaScript(m_frame->document()->url())) |
238 return; | 238 return; |
239 m_frame->navigationScheduler().scheduleRefresh(); | 239 m_frame->navigationScheduler().scheduleRefresh(); |
240 } | 240 } |
241 | 241 |
242 void Location::setLocation(const String& url, DOMWindow* activeWindow, DOMWindow
* firstWindow) | 242 void Location::setLocation(const String& url, DOMWindow* activeWindow, DOMWindow
* firstWindow) |
243 { | 243 { |
244 ASSERT(m_frame); | 244 ASSERT(m_frame); |
245 // We call findFrameForNavigation to handle the case of a seamless iframe co
rrectly. | 245 // We call findFrameForNavigation to handle the case of a seamless iframe co
rrectly. |
246 Frame* frame = m_frame->loader().findFrameForNavigation(String(), activeWind
ow->document()); | 246 Frame* frame = m_frame->loader().findFrameForNavigation(nullAtom, activeWind
ow->document()); |
247 if (!frame) | 247 if (!frame) |
248 return; | 248 return; |
249 frame->domWindow()->setLocation(url, activeWindow, firstWindow); | 249 frame->domWindow()->setLocation(url, activeWindow, firstWindow); |
250 } | 250 } |
251 | 251 |
252 } // namespace WebCore | 252 } // namespace WebCore |
OLD | NEW |