OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 Google 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 are | 5 * modification, are permitted provided that the following conditions are |
6 * met: | 6 * met: |
7 * | 7 * |
8 * * Redistributions of source code must retain the above copyright | 8 * * 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 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
(...skipping 278 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
289 ScriptController::isSafeScript(newFrame)) { | 289 ScriptController::isSafeScript(newFrame)) { |
290 KURL completedUrl = | 290 KURL completedUrl = |
291 url.isEmpty() ? KURL("") : activeFrame->document()->completeURL(url)
; | 291 url.isEmpty() ? KURL("") : activeFrame->document()->completeURL(url)
; |
292 bool userGesture = activeFrame->script()->processingUserGesture(); | 292 bool userGesture = activeFrame->script()->processingUserGesture(); |
293 | 293 |
294 if (created) { | 294 if (created) { |
295 newFrame->loader()->changeLocation( | 295 newFrame->loader()->changeLocation( |
296 completedUrl, | 296 completedUrl, |
297 activeFrame->loader()->outgoingReferrer(), | 297 activeFrame->loader()->outgoingReferrer(), |
298 false, | 298 false, |
| 299 false, |
299 userGesture); | 300 userGesture); |
300 } else if (!url.isEmpty()) { | 301 } else if (!url.isEmpty()) { |
301 newFrame->loader()->scheduleLocationChange( | 302 newFrame->loader()->scheduleLocationChange( |
302 completedUrl.string(), | 303 completedUrl.string(), |
303 activeFrame->loader()->outgoingReferrer(), | 304 activeFrame->loader()->outgoingReferrer(), |
304 false, | 305 false, |
305 userGesture); | 306 userGesture); |
306 } | 307 } |
307 } | 308 } |
308 | 309 |
(...skipping 399 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
708 } | 709 } |
709 | 710 |
710 CALLBACK_FUNC_DECL(DOMWindowClearInterval) | 711 CALLBACK_FUNC_DECL(DOMWindowClearInterval) |
711 { | 712 { |
712 INC_STATS("DOM.DOMWindow.clearInterval"); | 713 INC_STATS("DOM.DOMWindow.clearInterval"); |
713 ClearTimeoutImpl(args); | 714 ClearTimeoutImpl(args); |
714 return v8::Undefined(); | 715 return v8::Undefined(); |
715 } | 716 } |
716 | 717 |
717 } // namespace WebCore | 718 } // namespace WebCore |
OLD | NEW |