Improve CancellableTaskFactory handling and Oilpan usage.

Source/core/html/parser/HTMLParserScheduler.cpp

 /*
  * Copyright (C) 2010 Google, Inc. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 67 matching lines @@
 }
 
 void SpeculationsPumpSession::addedElementTokens(size_t count)
 {
     m_processedElementTokens += count;
 }
 
 HTMLParserScheduler::HTMLParserScheduler(HTMLDocumentParser* parser)
     : m_parser(parser)
     , m_loadingTaskRunner(Platform::current()->currentThread()->scheduler()->loadingTaskRunner())
-    , m_cancellableContinueParse(WTF::bind(&HTMLParserScheduler::continueParsing, this))
+    , m_cancellableContinueParse(CancellableTaskFactory::create(this, &HTMLParserScheduler::continueParsing))
     , m_isSuspendedWithActiveTimer(false)
 {
 }
 
 HTMLParserScheduler::~HTMLParserScheduler()
 {
 }
 
 void HTMLParserScheduler::scheduleForResume()
 {
     ASSERT(!m_isSuspendedWithActiveTimer);
-    m_loadingTaskRunner->postTask(FROM_HERE, m_cancellableContinueParse.cancelAndCreate());
+    m_loadingTaskRunner->postTask(FROM_HERE, m_cancellableContinueParse->cancelAndCreate());
 }
 
 void HTMLParserScheduler::suspend()
 {
     ASSERT(!m_isSuspendedWithActiveTimer);
-    if (!m_cancellableContinueParse.isPending())
+    if (!m_cancellableContinueParse->isPending())
         return;
     m_isSuspendedWithActiveTimer = true;
-    m_cancellableContinueParse.cancel();
+    m_cancellableContinueParse->cancel();
 }
 
 void HTMLParserScheduler::resume()
 {
-    ASSERT(!m_cancellableContinueParse.isPending());
+    ASSERT(!m_cancellableContinueParse->isPending());
     if (!m_isSuspendedWithActiveTimer)
         return;
     m_isSuspendedWithActiveTimer = false;
 
-    m_loadingTaskRunner->postTask(FROM_HERE, m_cancellableContinueParse.cancelAndCreate());
+    m_loadingTaskRunner->postTask(FROM_HERE, m_cancellableContinueParse->cancelAndCreate());
 }
 
 void HTMLParserScheduler::detach()
 {
-    m_cancellableContinueParse.cancel();
+    m_cancellableContinueParse->cancel();
     m_isSuspendedWithActiveTimer = false;
 }
 
 inline bool HTMLParserScheduler::shouldYield(const SpeculationsPumpSession& session, bool startingScript) const
 {
     if (Platform::current()->currentThread()->scheduler()->shouldYieldForHighPriorityWork())
         return true;
 
     const double parserTimeLimit = 0.5;
     if (session.elapsedTime() > parserTimeLimit)
@@ skipping 19 matching lines @@
     if (shouldYield(session, startingScript)) {
         scheduleForResume();
         return true;
     }
 
     return false;
 }
 
 void HTMLParserScheduler::forceResumeAfterYield()
 {
-    ASSERT(!m_cancellableContinueParse.isPending());
+    ASSERT(!m_cancellableContinueParse->isPending());
     m_isSuspendedWithActiveTimer = true;
 }
 
 void HTMLParserScheduler::continueParsing()
 {
     m_parser->resumeParsingAfterYield();
 }
 
 }