| 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. | 4 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. |
| 5 * (http://www.torchmobile.com/) | 5 * (http://www.torchmobile.com/) |
| 6 * Copyright (C) 2009 Adam Barth. All rights reserved. | 6 * Copyright (C) 2009 Adam Barth. All rights reserved. |
| 7 * | 7 * |
| 8 * Redistribution and use in source and binary forms, with or without | 8 * Redistribution and use in source and binary forms, with or without |
| 9 * modification, are permitted provided that the following conditions | 9 * modification, are permitted provided that the following conditions |
| 10 * are met: | 10 * are met: |
| (...skipping 471 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 482 return; | 482 return; |
| 483 schedule(ScheduledReload::create()); | 483 schedule(ScheduledReload::create()); |
| 484 } | 484 } |
| 485 | 485 |
| 486 void NavigationScheduler::navigateTask() { | 486 void NavigationScheduler::navigateTask() { |
| 487 Platform::current()->currentThread()->scheduler()->removePendingNavigation( | 487 Platform::current()->currentThread()->scheduler()->removePendingNavigation( |
| 488 m_frameType); | 488 m_frameType); |
| 489 | 489 |
| 490 if (!m_frame->page()) | 490 if (!m_frame->page()) |
| 491 return; | 491 return; |
| 492 if (m_frame->page()->defersLoading()) { | 492 if (m_frame->page()->suspended()) { |
| 493 InspectorInstrumentation::frameClearedScheduledNavigation(m_frame); | 493 InspectorInstrumentation::frameClearedScheduledNavigation(m_frame); |
| 494 return; | 494 return; |
| 495 } | 495 } |
| 496 | 496 |
| 497 ScheduledNavigation* redirect(m_redirect.release()); | 497 ScheduledNavigation* redirect(m_redirect.release()); |
| 498 redirect->fire(m_frame); | 498 redirect->fire(m_frame); |
| 499 InspectorInstrumentation::frameClearedScheduledNavigation(m_frame); | 499 InspectorInstrumentation::frameClearedScheduledNavigation(m_frame); |
| 500 } | 500 } |
| 501 | 501 |
| 502 void NavigationScheduler::schedule(ScheduledNavigation* redirect) { | 502 void NavigationScheduler::schedule(ScheduledNavigation* redirect) { |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 549 m_navigateTaskFactory->cancel(); | 549 m_navigateTaskFactory->cancel(); |
| 550 m_redirect.clear(); | 550 m_redirect.clear(); |
| 551 } | 551 } |
| 552 | 552 |
| 553 DEFINE_TRACE(NavigationScheduler) { | 553 DEFINE_TRACE(NavigationScheduler) { |
| 554 visitor->trace(m_frame); | 554 visitor->trace(m_frame); |
| 555 visitor->trace(m_redirect); | 555 visitor->trace(m_redirect); |
| 556 } | 556 } |
| 557 | 557 |
| 558 } // namespace blink | 558 } // namespace blink |
| OLD | NEW |