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 18 matching lines...) Expand all Loading... |
29 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 29 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
30 */ | 30 */ |
31 | 31 |
32 #include "config.h" | 32 #include "config.h" |
33 #include "core/loader/NavigationScheduler.h" | 33 #include "core/loader/NavigationScheduler.h" |
34 | 34 |
35 #include "bindings/v8/ScriptController.h" | 35 #include "bindings/v8/ScriptController.h" |
36 #include "core/dom/Event.h" | 36 #include "core/dom/Event.h" |
37 #include "core/dom/UserGestureIndicator.h" | 37 #include "core/dom/UserGestureIndicator.h" |
38 #include "core/history/BackForwardController.h" | 38 #include "core/history/BackForwardController.h" |
39 #include "core/history/HistoryItem.h" | |
40 #include "core/html/HTMLFormElement.h" | 39 #include "core/html/HTMLFormElement.h" |
41 #include "core/html/HTMLFrameOwnerElement.h" | |
42 #include "core/inspector/InspectorInstrumentation.h" | 40 #include "core/inspector/InspectorInstrumentation.h" |
43 #include "core/loader/DocumentLoader.h" | 41 #include "core/loader/DocumentLoader.h" |
44 #include "core/loader/FormState.h" | 42 #include "core/loader/FormState.h" |
45 #include "core/loader/FormSubmission.h" | 43 #include "core/loader/FormSubmission.h" |
46 #include "core/loader/FrameLoadRequest.h" | 44 #include "core/loader/FrameLoadRequest.h" |
47 #include "core/loader/FrameLoader.h" | 45 #include "core/loader/FrameLoader.h" |
48 #include "core/loader/FrameLoaderStateMachine.h" | 46 #include "core/loader/FrameLoaderStateMachine.h" |
49 #include "core/page/DOMWindow.h" | |
50 #include "core/page/Frame.h" | 47 #include "core/page/Frame.h" |
51 #include "core/page/Page.h" | 48 #include "core/page/Page.h" |
52 #include <wtf/CurrentTime.h> | 49 #include "wtf/CurrentTime.h" |
53 | 50 |
54 namespace WebCore { | 51 namespace WebCore { |
55 | 52 |
56 unsigned NavigationDisablerForBeforeUnload::s_navigationDisableCount = 0; | 53 unsigned NavigationDisablerForBeforeUnload::s_navigationDisableCount = 0; |
57 | 54 |
58 class ScheduledNavigation { | 55 class ScheduledNavigation { |
59 WTF_MAKE_NONCOPYABLE(ScheduledNavigation); WTF_MAKE_FAST_ALLOCATED; | 56 WTF_MAKE_NONCOPYABLE(ScheduledNavigation); WTF_MAKE_FAST_ALLOCATED; |
60 public: | 57 public: |
61 ScheduledNavigation(double delay, bool lockBackForwardList, bool wasDuringLo
ad, bool isLocationChange) | 58 ScheduledNavigation(double delay, bool lockBackForwardList, bool wasDuringLo
ad, bool isLocationChange) |
62 : m_delay(delay) | 59 : m_delay(delay) |
(...skipping 422 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
485 if (m_timer.isActive()) | 482 if (m_timer.isActive()) |
486 InspectorInstrumentation::frameClearedScheduledNavigation(m_frame); | 483 InspectorInstrumentation::frameClearedScheduledNavigation(m_frame); |
487 m_timer.stop(); | 484 m_timer.stop(); |
488 | 485 |
489 OwnPtr<ScheduledNavigation> redirect(m_redirect.release()); | 486 OwnPtr<ScheduledNavigation> redirect(m_redirect.release()); |
490 if (redirect) | 487 if (redirect) |
491 redirect->didStopTimer(m_frame); | 488 redirect->didStopTimer(m_frame); |
492 } | 489 } |
493 | 490 |
494 } // namespace WebCore | 491 } // namespace WebCore |
OLD | NEW |