| 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 246 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 257 | 257 |
| 258 NavigationScheduler::NavigationScheduler(LocalFrame* frame) | 258 NavigationScheduler::NavigationScheduler(LocalFrame* frame) |
| 259 : m_frame(frame) | 259 : m_frame(frame) |
| 260 , m_navigateTaskFactory(CancellableTaskFactory::create(this, &NavigationSche
duler::navigateTask)) | 260 , m_navigateTaskFactory(CancellableTaskFactory::create(this, &NavigationSche
duler::navigateTask)) |
| 261 , m_frameType(m_frame->isMainFrame() ? WebScheduler::NavigatingFrameType::kM
ainFrame : WebScheduler::NavigatingFrameType::kChildFrame) | 261 , m_frameType(m_frame->isMainFrame() ? WebScheduler::NavigatingFrameType::kM
ainFrame : WebScheduler::NavigatingFrameType::kChildFrame) |
| 262 { | 262 { |
| 263 } | 263 } |
| 264 | 264 |
| 265 NavigationScheduler::~NavigationScheduler() | 265 NavigationScheduler::~NavigationScheduler() |
| 266 { | 266 { |
| 267 // TODO(alexclarke): Can remove this if oilpan is on since any pending task
should | |
| 268 // keep the NavigationScheduler alive. | |
| 269 if (m_navigateTaskFactory->isPending()) | 267 if (m_navigateTaskFactory->isPending()) |
| 270 Platform::current()->currentThread()->scheduler()->removePendingNavigati
on(m_frameType); | 268 Platform::current()->currentThread()->scheduler()->removePendingNavigati
on(m_frameType); |
| 271 } | 269 } |
| 272 | 270 |
| 273 bool NavigationScheduler::locationChangePending() | 271 bool NavigationScheduler::locationChangePending() |
| 274 { | 272 { |
| 275 return m_redirect && m_redirect->isLocationChange(); | 273 return m_redirect && m_redirect->isLocationChange(); |
| 276 } | 274 } |
| 277 | 275 |
| 278 bool NavigationScheduler::isNavigationScheduledWithin(double interval) const | 276 bool NavigationScheduler::isNavigationScheduledWithin(double interval) const |
| (...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 447 m_redirect.clear(); | 445 m_redirect.clear(); |
| 448 } | 446 } |
| 449 | 447 |
| 450 DEFINE_TRACE(NavigationScheduler) | 448 DEFINE_TRACE(NavigationScheduler) |
| 451 { | 449 { |
| 452 visitor->trace(m_frame); | 450 visitor->trace(m_frame); |
| 453 visitor->trace(m_redirect); | 451 visitor->trace(m_redirect); |
| 454 } | 452 } |
| 455 | 453 |
| 456 } // namespace blink | 454 } // namespace blink |
| OLD | NEW |