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 29 matching lines...) Expand all Loading... |
40 #include "FormSubmission.h" | 40 #include "FormSubmission.h" |
41 #include "Frame.h" | 41 #include "Frame.h" |
42 #include "FrameLoadRequest.h" | 42 #include "FrameLoadRequest.h" |
43 #include "FrameLoader.h" | 43 #include "FrameLoader.h" |
44 #include "FrameLoaderStateMachine.h" | 44 #include "FrameLoaderStateMachine.h" |
45 #include "HTMLFormElement.h" | 45 #include "HTMLFormElement.h" |
46 #include "HTMLFrameOwnerElement.h" | 46 #include "HTMLFrameOwnerElement.h" |
47 #include "HistoryItem.h" | 47 #include "HistoryItem.h" |
48 #include "InspectorInstrumentation.h" | 48 #include "InspectorInstrumentation.h" |
49 #include "Page.h" | 49 #include "Page.h" |
| 50 #include "ScriptController.h" |
50 #include "UserGestureIndicator.h" | 51 #include "UserGestureIndicator.h" |
51 #include <wtf/CurrentTime.h> | 52 #include <wtf/CurrentTime.h> |
52 | 53 |
53 namespace WebCore { | 54 namespace WebCore { |
54 | 55 |
55 unsigned NavigationDisablerForBeforeUnload::s_navigationDisableCount = 0; | 56 unsigned NavigationDisablerForBeforeUnload::s_navigationDisableCount = 0; |
56 | 57 |
57 class ScheduledNavigation { | 58 class ScheduledNavigation { |
58 WTF_MAKE_NONCOPYABLE(ScheduledNavigation); WTF_MAKE_FAST_ALLOCATED; | 59 WTF_MAKE_NONCOPYABLE(ScheduledNavigation); WTF_MAKE_FAST_ALLOCATED; |
59 public: | 60 public: |
(...skipping 414 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
474 if (m_timer.isActive()) | 475 if (m_timer.isActive()) |
475 InspectorInstrumentation::frameClearedScheduledNavigation(m_frame); | 476 InspectorInstrumentation::frameClearedScheduledNavigation(m_frame); |
476 m_timer.stop(); | 477 m_timer.stop(); |
477 | 478 |
478 OwnPtr<ScheduledNavigation> redirect(m_redirect.release()); | 479 OwnPtr<ScheduledNavigation> redirect(m_redirect.release()); |
479 if (redirect) | 480 if (redirect) |
480 redirect->didStopTimer(m_frame, newLoadInProgress); | 481 redirect->didStopTimer(m_frame, newLoadInProgress); |
481 } | 482 } |
482 | 483 |
483 } // namespace WebCore | 484 } // namespace WebCore |
OLD | NEW |