Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved. | 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved. |
| 3 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) | 3 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) |
| 4 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) | 4 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) |
| 5 * Copyright (C) 2009 Adam Barth. All rights reserved. | 5 * Copyright (C) 2009 Adam Barth. All rights reserved. |
| 6 * | 6 * |
| 7 * Redistribution and use in source and binary forms, with or without | 7 * Redistribution and use in source and binary forms, with or without |
| 8 * modification, are permitted provided that the following conditions | 8 * modification, are permitted provided that the following conditions |
| 9 * are met: | 9 * are met: |
| 10 * | 10 * |
| (...skipping 303 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 314 if (lockBackForwardList) | 314 if (lockBackForwardList) |
| 315 request.setClientRedirect(ClientRedirect); | 315 request.setClientRedirect(ClientRedirect); |
| 316 m_frame->loader().load(request); | 316 m_frame->loader().load(request); |
| 317 return; | 317 return; |
| 318 } | 318 } |
| 319 } | 319 } |
| 320 | 320 |
| 321 schedule(adoptPtr(new ScheduledLocationChange(originDocument, url, referrer, lockBackForwardList))); | 321 schedule(adoptPtr(new ScheduledLocationChange(originDocument, url, referrer, lockBackForwardList))); |
| 322 } | 322 } |
| 323 | 323 |
| 324 void NavigationScheduler::schedulePageBlock(Document* originDocument, const Refe rrer& referrer) | |
| 325 { | |
| 326 ASSERT(m_frame->page()); | |
| 327 schedule(adoptPtr(new ScheduledLocationChange(originDocument, "data:,", refe rrer, false))); | |
|
Nate Chapin
2014/07/14 19:26:40
I'd prefer to use SecurityOrigin::urlWithUniqueSec
Tom Sepez
2014/07/14 19:45:49
I thought there was a threading issue here. I gue
| |
| 328 } | |
| 329 | |
| 324 void NavigationScheduler::scheduleFormSubmission(PassRefPtrWillBeRawPtr<FormSubm ission> submission) | 330 void NavigationScheduler::scheduleFormSubmission(PassRefPtrWillBeRawPtr<FormSubm ission> submission) |
| 325 { | 331 { |
| 326 ASSERT(m_frame->page()); | 332 ASSERT(m_frame->page()); |
| 327 schedule(adoptPtr(new ScheduledFormSubmission(submission, mustLockBackForwar dList(m_frame)))); | 333 schedule(adoptPtr(new ScheduledFormSubmission(submission, mustLockBackForwar dList(m_frame)))); |
| 328 } | 334 } |
| 329 | 335 |
| 330 void NavigationScheduler::scheduleRefresh() | 336 void NavigationScheduler::scheduleRefresh() |
| 331 { | 337 { |
| 332 if (!shouldScheduleNavigation()) | 338 if (!shouldScheduleNavigation()) |
| 333 return; | 339 return; |
| (...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 408 | 414 |
| 409 void NavigationScheduler::cancel() | 415 void NavigationScheduler::cancel() |
| 410 { | 416 { |
| 411 if (m_timer.isActive()) | 417 if (m_timer.isActive()) |
| 412 InspectorInstrumentation::frameClearedScheduledNavigation(m_frame); | 418 InspectorInstrumentation::frameClearedScheduledNavigation(m_frame); |
| 413 m_timer.stop(); | 419 m_timer.stop(); |
| 414 m_redirect.clear(); | 420 m_redirect.clear(); |
| 415 } | 421 } |
| 416 | 422 |
| 417 } // namespace WebCore | 423 } // namespace WebCore |
| OLD | NEW |