| 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 371 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  382 { |  382 { | 
|  383     if (!m_redirect) |  383     if (!m_redirect) | 
|  384         return; |  384         return; | 
|  385  |  385  | 
|  386     ASSERT(m_frame->page()); |  386     ASSERT(m_frame->page()); | 
|  387     if (m_timer.isActive()) |  387     if (m_timer.isActive()) | 
|  388         return; |  388         return; | 
|  389     if (!m_redirect->shouldStartTimer(m_frame)) |  389     if (!m_redirect->shouldStartTimer(m_frame)) | 
|  390         return; |  390         return; | 
|  391  |  391  | 
|  392     m_timer.startOneShot(m_redirect->delay()); |  392     m_timer.startOneShot(m_redirect->delay(), FROM_HERE); | 
|  393     InspectorInstrumentation::frameScheduledNavigation(m_frame, m_redirect->dela
     y()); |  393     InspectorInstrumentation::frameScheduledNavigation(m_frame, m_redirect->dela
     y()); | 
|  394 } |  394 } | 
|  395  |  395  | 
|  396 void NavigationScheduler::cancel() |  396 void NavigationScheduler::cancel() | 
|  397 { |  397 { | 
|  398     if (m_timer.isActive()) |  398     if (m_timer.isActive()) | 
|  399         InspectorInstrumentation::frameClearedScheduledNavigation(m_frame); |  399         InspectorInstrumentation::frameClearedScheduledNavigation(m_frame); | 
|  400     m_timer.stop(); |  400     m_timer.stop(); | 
|  401     m_redirect.clear(); |  401     m_redirect.clear(); | 
|  402 } |  402 } | 
|  403  |  403  | 
|  404 } // namespace WebCore |  404 } // namespace WebCore | 
| OLD | NEW |