Remove ENABLE(OILPAN) from ScriptRunner and PendingScript.

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 23 matching lines @@
 #include "public/platform/WebScheduler.h"
 #include "public/platform/WebThread.h"
 
 namespace blink {
 
 ScriptRunner::ScriptRunner(Document* document)
     : m_document(document)
     , m_taskRunner(Platform::current()->currentThread()->scheduler()->loadingTaskRunner())
     , m_numberOfInOrderScriptsWithPendingNotification(0)
     , m_isSuspended(false)
-#if !ENABLE(OILPAN)
-    , m_isDisposed(false)
-    , m_weakPointerFactoryForTasks(this)
-#endif
 {
     DCHECK(document);
 #ifndef NDEBUG
     m_hasEverBeenSuspended = false;
 #endif
 }
 
 ScriptRunner::~ScriptRunner()
 {
-#if !ENABLE(OILPAN)
-    dispose();
-#endif
 }
 
-#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();
-    for (ScriptLoader* scriptLoader : m_inOrderScriptsToExecuteSoon)
-        scriptLoader->detach();
-    for (ScriptLoader* scriptLoader : m_asyncScriptsToExecuteSoon)
-        scriptLoader->detach();
-
-    m_pendingInOrderScripts.clear();
-    m_pendingAsyncScripts.clear();
-    m_inOrderScriptsToExecuteSoon.clear();
-    m_asyncScriptsToExecuteSoon.clear();
-    m_isDisposed = true;
-    m_numberOfInOrderScriptsWithPendingNotification = 0;
-}
-#endif
-
 void ScriptRunner::queueScriptForExecution(ScriptLoader* scriptLoader, ExecutionType executionType)
 {
     DCHECK(scriptLoader);
     m_document->incrementLoadEventDelayCount();
     switch (executionType) {
     case ASYNC_EXECUTION:
         m_pendingAsyncScripts.add(scriptLoader);
         break;
 
     case IN_ORDER_EXECUTION:
         m_pendingInOrderScripts.append(scriptLoader);
         m_numberOfInOrderScriptsWithPendingNotification++;
         break;
     }
 }
 
 void ScriptRunner::postTask(const WebTraceLocation& webTraceLocation)
 {
-#if !ENABLE(OILPAN)
-    m_taskRunner->postTask(webTraceLocation, bind(&ScriptRunner::executeTask, m_weakPointerFactoryForTasks.createWeakPtr()));
-#else
     m_taskRunner->postTask(webTraceLocation, bind(&ScriptRunner::executeTask, WeakPersistentThisPointer<ScriptRunner>(this)));
-#endif
 }
 
 void ScriptRunner::suspend()
 {
 #ifndef NDEBUG
     m_hasEverBeenSuspended = true;
 #endif
 
     m_isSuspended = true;
 }
@@ skipping 66 matching lines @@
 }
 
 void ScriptRunner::notifyScriptLoadError(ScriptLoader* scriptLoader, ExecutionType executionType)
 {
     switch (executionType) {
     case ASYNC_EXECUTION: {
         // RELEASE_ASSERT makes us crash in a controlled way in error cases
         // where the ScriptLoader is associated with the wrong ScriptRunner
         // (otherwise we'd cause a use-after-free in ~ScriptRunner when it tries
         // to detach).
-        bool foundLoader = m_pendingAsyncScripts.contains(scriptLoader);
-#if !ENABLE(OILPAN)
-        // If the ScriptRunner has been disposed of, no pending scripts remain.
-        foundLoader = foundLoader || m_isDisposed;
-#endif
-        SECURITY_CHECK(foundLoader);
+        SECURITY_CHECK(m_pendingAsyncScripts.contains(scriptLoader));
         m_pendingAsyncScripts.remove(scriptLoader);
         break;
     }
     case IN_ORDER_EXECUTION:
-        bool foundLoader = removePendingInOrderScript(scriptLoader);
-#if !ENABLE(OILPAN)
-        foundLoader = foundLoader || m_isDisposed;
-#endif
-        SECURITY_CHECK(foundLoader);
+        SECURITY_CHECK(removePendingInOrderScript(scriptLoader));
         scheduleReadyInOrderScripts();
         break;
     }
     m_document->decrementLoadEventDelayCount();
 }
 
 void ScriptRunner::movePendingScript(Document& oldDocument, Document& newDocument, ScriptLoader* scriptLoader)
 {
     Document* newContextDocument = newDocument.contextDocument();
     if (!newContextDocument) {
@@ skipping 64 matching lines @@
 DEFINE_TRACE(ScriptRunner)
 {
     visitor->trace(m_document);
     visitor->trace(m_pendingInOrderScripts);
     visitor->trace(m_pendingAsyncScripts);
     visitor->trace(m_asyncScriptsToExecuteSoon);
     visitor->trace(m_inOrderScriptsToExecuteSoon);
 }
 
 } // namespace blink