Oilpan: Remove most WillBe types from the code base

third_party/WebKit/Source/core/dom/ScriptRunner.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 45 matching lines @@
 {
 #if !ENABLE(OILPAN)
     dispose();
 #endif
 }
 
 class ScriptRunner::Task : public WebTaskRunner::Task {
     WTF_MAKE_NONCOPYABLE(Task);
 
 public:
-    explicit Task(WeakPtrWillBeRawPtr<ScriptRunner> scriptRunner)
+    explicit Task(RawPtr<ScriptRunner> scriptRunner)
         : m_scriptRunner(scriptRunner)
     {
     }
 
     virtual ~Task() { };
 
     void run() override
     {
         if (!m_scriptRunner)
             return;
         m_scriptRunner->executeTask();
     }
 
 private:
-    WeakPtrWillBeWeakPersistent<ScriptRunner> m_scriptRunner;
+    WeakPersistent<ScriptRunner> m_scriptRunner;
 };
 
 #if !ENABLE(OILPAN)
 void ScriptRunner::dispose()
 {
     // Make sure that ScriptLoaders don't keep their PendingScripts alive.
     for (ScriptLoader* scriptLoader : m_pendingInOrderScripts)
         scriptLoader->detach();
     for (ScriptLoader* scriptLoader : m_pendingAsyncScripts)
         scriptLoader->detach();
@@ skipping 23 matching lines @@
     case IN_ORDER_EXECUTION:
         m_pendingInOrderScripts.append(scriptLoader);
         m_numberOfInOrderScriptsWithPendingNotification++;
         break;
     }
 }
 
 void ScriptRunner::postTask(const WebTraceLocation& webTraceLocation)
 {
     // TODO(altimin): Replace all this with `new Task(this)` when Oilpan is here.
-    WeakPtrWillBeRawPtr<ScriptRunner> scriptRunnerForTask;
+    RawPtr<ScriptRunner> scriptRunnerForTask;
 #if !ENABLE(OILPAN)
     scriptRunnerForTask = m_weakPointerFactoryForTasks.createWeakPtr();
 #else
     scriptRunnerForTask = this;
 #endif
     m_taskRunner->postTask(webTraceLocation, new Task(scriptRunnerForTask));
 }
 
 void ScriptRunner::suspend()
 {
@@ skipping 86 matching lines @@
 #endif
         RELEASE_ASSERT_WITH_SECURITY_IMPLICATION(foundLoader);
         break;
     }
     scriptLoader->detach();
     m_document->decrementLoadEventDelayCount();
 }
 
 void ScriptRunner::movePendingScript(Document& oldDocument, Document& newDocument, ScriptLoader* scriptLoader)
 {
-    RefPtrWillBeRawPtr<Document> newContextDocument = newDocument.contextDocument().get();
+    RawPtr<Document> newContextDocument = newDocument.contextDocument().get();
     if (!newContextDocument) {
         // Document's contextDocument() method will return no Document if the
         // following conditions both hold:
         //
         //   - The Document wasn't created with an explicit context document
         //     and that document is otherwise kept alive.
         //   - The Document itself is detached from its frame.
         //
         // The script element's loader is in that case moved to document() and
         // its script runner, which is the non-null Document that contextDocument()
         // would return if not detached.
         ASSERT(!newDocument.frame());
         newContextDocument = &newDocument;
     }
-    RefPtrWillBeRawPtr<Document> oldContextDocument = oldDocument.contextDocument().get();
+    RawPtr<Document> oldContextDocument = oldDocument.contextDocument().get();
     if (!oldContextDocument) {
         ASSERT(!oldDocument.frame());
         oldContextDocument = &oldDocument;
     }
     if (oldContextDocument != newContextDocument)
         oldContextDocument->scriptRunner()->movePendingScript(newContextDocument->scriptRunner(), scriptLoader);
 }
 
 void ScriptRunner::movePendingScript(ScriptRunner* newRunner, ScriptLoader* scriptLoader)
 {
     if (m_pendingAsyncScripts.contains(scriptLoader)) {
         newRunner->queueScriptForExecution(scriptLoader, ASYNC_EXECUTION);
         m_pendingAsyncScripts.remove(scriptLoader);
         m_document->decrementLoadEventDelayCount();
         return;
     }
     if (removePendingInOrderScript(scriptLoader)) {
         newRunner->queueScriptForExecution(scriptLoader, IN_ORDER_EXECUTION);
         m_document->decrementLoadEventDelayCount();
     }
 }
 
 // Returns true if task was run, and false otherwise.
-bool ScriptRunner::executeTaskFromQueue(WillBeHeapDeque<RawPtrWillBeMember<ScriptLoader>>* taskQueue)
+bool ScriptRunner::executeTaskFromQueue(HeapDeque<Member<ScriptLoader>>* taskQueue)
 {
     if (taskQueue->isEmpty())
         return false;
     taskQueue->takeFirst()->execute();
 
     m_document->decrementLoadEventDelayCount();
     return true;
 }
 
 void ScriptRunner::executeTask()
@@ skipping 18 matching lines @@
 #if ENABLE(OILPAN)
     visitor->trace(m_document);
     visitor->trace(m_pendingInOrderScripts);
     visitor->trace(m_pendingAsyncScripts);
     visitor->trace(m_asyncScriptsToExecuteSoon);
     visitor->trace(m_inOrderScriptsToExecuteSoon);
 #endif
 }
 
 } // namespace blink