Oilpan: tidy up NavigationScheduler.

Source/core/loader/NavigationScheduler.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (C) 2009 Adam Barth. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
@@ skipping 30 matching lines @@
 #include "core/inspector/InspectorInstrumentation.h"
 #include "core/loader/DocumentLoader.h"
 #include "core/loader/FormSubmission.h"
 #include "core/loader/FrameLoadRequest.h"
 #include "core/loader/FrameLoader.h"
 #include "core/loader/FrameLoaderClient.h"
 #include "core/loader/FrameLoaderStateMachine.h"
 #include "core/page/Page.h"
 #include "platform/SharedBuffer.h"
 #include "platform/UserGestureIndicator.h"
+#include "platform/scheduler/CancellableTaskFactory.h"
 #include "public/platform/Platform.h"
 #include "wtf/CurrentTime.h"
 
 namespace blink {
 
 unsigned NavigationDisablerForBeforeUnload::s_navigationDisableCount = 0;
 
 FrameNavigationDisabler::FrameNavigationDisabler(LocalFrame* frame)
-    : m_navigationScheduler(frame->navigationScheduler())
+    : m_navigationScheduler(&frame->navigationScheduler())
 {
-    m_navigationScheduler.disableFrameNavigation();
+    m_navigationScheduler->disableFrameNavigation();
 }
 
 FrameNavigationDisabler::~FrameNavigationDisabler()
 {
-    m_navigationScheduler.enableFrameNavigation();
+    m_navigationScheduler->enableFrameNavigation();
 }
 
 class ScheduledNavigation : public NoBaseWillBeGarbageCollectedFinalized<ScheduledNavigation> {
     WTF_MAKE_NONCOPYABLE(ScheduledNavigation); WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED(ScheduledNavigation);
 public:
     ScheduledNavigation(double delay, Document* originDocument, bool replacesCurrentItem, bool isLocationChange)
         : m_delay(delay)
         , m_originDocument(originDocument)
         , m_replacesCurrentItem(replacesCurrentItem)
         , m_isLocationChange(isLocationChange)
@@ skipping 183 matching lines @@
         , m_submission(submission)
     {
         ASSERT(m_submission->form());
     }
 
     RefPtrWillBeMember<FormSubmission> m_submission;
 };
 
 NavigationScheduler::NavigationScheduler(LocalFrame* frame)
     : m_frame(frame)
-    , m_navigateTaskFactory(WTF::bind(&NavigationScheduler::navigateTask, this))
+    , m_navigateTaskFactory(CancellableTaskFactory::create(this, &NavigationScheduler::navigateTask))
     , m_navigationDisableCount(0)
 {
 }
 
 NavigationScheduler::~NavigationScheduler()
 {
 }
 
 bool NavigationScheduler::locationChangePending()
 {
@@ skipping 126 matching lines @@
     m_redirect = redirect;
     startTimer();
 }
 
 void NavigationScheduler::startTimer()
 {
     if (!m_redirect)
         return;
 
     ASSERT(m_frame->page());
-    if (m_navigateTaskFactory.isPending())
+    if (m_navigateTaskFactory->isPending())
         return;
     if (!m_redirect->shouldStartTimer(m_frame))
         return;
 
     Platform::current()->currentThread()->scheduler()->loadingTaskRunner()->postDelayedTask(
-        FROM_HERE, m_navigateTaskFactory.cancelAndCreate(), m_redirect->delay());
+        FROM_HERE, m_navigateTaskFactory->cancelAndCreate(), m_redirect->delay());
 
     InspectorInstrumentation::frameScheduledNavigation(m_frame, m_redirect->delay());
 }
 
 void NavigationScheduler::cancel()
 {
-    if (m_navigateTaskFactory.isPending())
+    if (m_navigateTaskFactory->isPending())
         InspectorInstrumentation::frameClearedScheduledNavigation(m_frame);
-    m_navigateTaskFactory.cancel();
+    m_navigateTaskFactory->cancel();
     m_redirect.clear();
 }
 
 DEFINE_TRACE(NavigationScheduler)
 {
     visitor->trace(m_frame);
     visitor->trace(m_redirect);
 }
 
 } // namespace blink