| 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 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 111 request.setLockBackForwardList(lockBackForwardList()); | 111 request.setLockBackForwardList(lockBackForwardList()); |
| 112 request.setClientRedirect(ClientRedirect); | 112 request.setClientRedirect(ClientRedirect); |
| 113 frame->loader().load(request); | 113 frame->loader().load(request); |
| 114 } | 114 } |
| 115 | 115 |
| 116 Document* originDocument() const { return m_originDocument.get(); } | 116 Document* originDocument() const { return m_originDocument.get(); } |
| 117 String url() const { return m_url; } | 117 String url() const { return m_url; } |
| 118 const Referrer& referrer() const { return m_referrer; } | 118 const Referrer& referrer() const { return m_referrer; } |
| 119 | 119 |
| 120 private: | 120 private: |
| 121 RefPtr<Document> m_originDocument; | 121 RefPtrWillBePersistent<Document> m_originDocument; |
| 122 String m_url; | 122 String m_url; |
| 123 Referrer m_referrer; | 123 Referrer m_referrer; |
| 124 }; | 124 }; |
| 125 | 125 |
| 126 class ScheduledRedirect FINAL : public ScheduledURLNavigation { | 126 class ScheduledRedirect FINAL : public ScheduledURLNavigation { |
| 127 public: | 127 public: |
| 128 ScheduledRedirect(double delay, Document* originDocument, const String& url,
bool lockBackForwardList) | 128 ScheduledRedirect(double delay, Document* originDocument, const String& url,
bool lockBackForwardList) |
| 129 : ScheduledURLNavigation(delay, originDocument, url, Referrer(), lockBac
kForwardList, false) | 129 : ScheduledURLNavigation(delay, originDocument, url, Referrer(), lockBac
kForwardList, false) |
| 130 { | 130 { |
| 131 clearUserGesture(); | 131 clearUserGesture(); |
| (...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 408 | 408 |
| 409 void NavigationScheduler::cancel() | 409 void NavigationScheduler::cancel() |
| 410 { | 410 { |
| 411 if (m_timer.isActive()) | 411 if (m_timer.isActive()) |
| 412 InspectorInstrumentation::frameClearedScheduledNavigation(m_frame); | 412 InspectorInstrumentation::frameClearedScheduledNavigation(m_frame); |
| 413 m_timer.stop(); | 413 m_timer.stop(); |
| 414 m_redirect.clear(); | 414 m_redirect.clear(); |
| 415 } | 415 } |
| 416 | 416 |
| 417 } // namespace WebCore | 417 } // namespace WebCore |
| OLD | NEW |