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 220 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
231 return; | 231 return; |
232 setLocation(url, callingWindow, enteredWindow, SetLocation::ReplaceThisFrame
); | 232 setLocation(url, callingWindow, enteredWindow, SetLocation::ReplaceThisFrame
); |
233 } | 233 } |
234 | 234 |
235 void Location::reload(LocalDOMWindow* callingWindow) | 235 void Location::reload(LocalDOMWindow* callingWindow) |
236 { | 236 { |
237 if (!m_frame) | 237 if (!m_frame) |
238 return; | 238 return; |
239 if (protocolIsJavaScript(toLocalFrame(m_frame)->document()->url())) | 239 if (protocolIsJavaScript(toLocalFrame(m_frame)->document()->url())) |
240 return; | 240 return; |
241 m_frame->reload(NormalReload, ClientRedirect); | 241 m_frame->reload(FrameLoadTypeReload, ClientRedirect); |
242 } | 242 } |
243 | 243 |
244 void Location::setLocation(const String& url, LocalDOMWindow* callingWindow, Loc
alDOMWindow* enteredWindow, SetLocation locationPolicy) | 244 void Location::setLocation(const String& url, LocalDOMWindow* callingWindow, Loc
alDOMWindow* enteredWindow, SetLocation locationPolicy) |
245 { | 245 { |
246 ASSERT(m_frame); | 246 ASSERT(m_frame); |
247 if (!m_frame || !m_frame->host()) | 247 if (!m_frame || !m_frame->host()) |
248 return; | 248 return; |
249 | 249 |
250 if (!callingWindow->frame() || !callingWindow->frame()->canNavigate(*m_frame
)) | 250 if (!callingWindow->frame() || !callingWindow->frame()->canNavigate(*m_frame
)) |
251 return; | 251 return; |
(...skipping 15 matching lines...) Expand all Loading... |
267 argv.append("LocalDOMWindow"); | 267 argv.append("LocalDOMWindow"); |
268 argv.append("url"); | 268 argv.append("url"); |
269 argv.append(enteredDocument->url()); | 269 argv.append(enteredDocument->url()); |
270 argv.append(completedURL); | 270 argv.append(completedURL); |
271 activityLogger->logEvent("blinkSetAttribute", argv.size(), argv.data()); | 271 activityLogger->logEvent("blinkSetAttribute", argv.size(), argv.data()); |
272 } | 272 } |
273 m_frame->navigate(*callingWindow->document(), completedURL, locationPolicy =
= SetLocation::ReplaceThisFrame, UserGestureStatus::None); | 273 m_frame->navigate(*callingWindow->document(), completedURL, locationPolicy =
= SetLocation::ReplaceThisFrame, UserGestureStatus::None); |
274 } | 274 } |
275 | 275 |
276 } // namespace blink | 276 } // namespace blink |
OLD | NEW |