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 172 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
183 if (!m_historySteps) { | 183 if (!m_historySteps) { |
184 FrameLoadRequest frameRequest(frame->document(), ResourceRequest(fra
me->document()->url())); | 184 FrameLoadRequest frameRequest(frame->document(), ResourceRequest(fra
me->document()->url())); |
185 frameRequest.setLockBackForwardList(lockBackForwardList()); | 185 frameRequest.setLockBackForwardList(lockBackForwardList()); |
186 // Special case for go(0) from a frame -> reload only the frame | 186 // Special case for go(0) from a frame -> reload only the frame |
187 // To follow Firefox and IE's behavior, history reload can only navi
gate the self frame. | 187 // To follow Firefox and IE's behavior, history reload can only navi
gate the self frame. |
188 frame->loader().load(frameRequest); | 188 frame->loader().load(frameRequest); |
189 return; | 189 return; |
190 } | 190 } |
191 // go(i!=0) from a frame navigates into the history of the frame only, | 191 // go(i!=0) from a frame navigates into the history of the frame only, |
192 // in both IE and NS (but not in Mozilla). We can't easily do that. | 192 // in both IE and NS (but not in Mozilla). We can't easily do that. |
193 frame->page()->mainFrame()->loader().client()->navigateBackForward(m_his
torySteps); | 193 frame->page()->deprecatedLocalMainFrame()->loader().client()->navigateBa
ckForward(m_historySteps); |
194 } | 194 } |
195 | 195 |
196 private: | 196 private: |
197 int m_historySteps; | 197 int m_historySteps; |
198 }; | 198 }; |
199 | 199 |
200 class ScheduledFormSubmission FINAL : public ScheduledNavigation { | 200 class ScheduledFormSubmission FINAL : public ScheduledNavigation { |
201 public: | 201 public: |
202 ScheduledFormSubmission(PassRefPtrWillBeRawPtr<FormSubmission> submission, b
ool lockBackForwardList) | 202 ScheduledFormSubmission(PassRefPtrWillBeRawPtr<FormSubmission> submission, b
ool lockBackForwardList) |
203 : ScheduledNavigation(0, lockBackForwardList, true) | 203 : ScheduledNavigation(0, lockBackForwardList, true) |
(...skipping 204 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 |