Revert of WebAudio: Fix AudioNode leak in a case that AudioNode is not disconnected from the ...

Source/platform/heap/ThreadState.cpp

 /*
  * Copyright (C) 2013 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 900 matching lines @@
 
 void ThreadState::preGC()
 {
     ASSERT(!isInGC());
     setGCState(GCRunning);
     makeConsistentForSweeping();
     prepareRegionTree();
     flushHeapDoesNotContainCacheIfNeeded();
     if (isMainThread())
         m_allocatedObjectSizeBeforeGC = Heap::allocatedObjectSize() + Heap::markedObjectSize();
-    invokePreMarkingTasks();
 }
 
 void ThreadState::postGC(GCType gcType)
 {
     ASSERT(isInGC());
 
 #if ENABLE(GC_PROFILING)
     // We snapshot the heap prior to sweeping to get numbers for both resources
     // that have been allocated since the last GC and for resources that are
     // going to be freed.
     bool gcTracingEnabled;
     TRACE_EVENT_CATEGORY_GROUP_ENABLED("blink_gc", &gcTracingEnabled);
 
     if (gcTracingEnabled) {
         bool disabledByDefaultGCTracingEnabled;
         TRACE_EVENT_CATEGORY_GROUP_ENABLED(TRACE_DISABLED_BY_DEFAULT("blink_gc"), &disabledByDefaultGCTracingEnabled);
 
         snapshot();
         if (disabledByDefaultGCTracingEnabled)
             collectAndReportMarkSweepStats();
         incrementMarkedObjectsAge();
     }
 #endif
 
-    invokePostMarkingTasks();
     setGCState(gcType == GCWithSweep ? EagerSweepScheduled : LazySweepScheduled);
     for (int i = 0; i < NumberOfHeaps; i++)
         m_heaps[i]->prepareForSweep();
 }
 
-void ThreadState::invokePreMarkingTasks()
-{
-    ASSERT(isInGC());
-    for (MarkingTask* task : m_markingTasks)
-        task->willStartMarking(*this);
-}
-
-void ThreadState::invokePostMarkingTasks()
-{
-    ASSERT(isInGC());
-    for (size_t i = m_markingTasks.size(); i > 0; --i)
-        m_markingTasks[i - 1]->didFinishMarking(*this);
-}
-
-void ThreadState::addMarkingTask(MarkingTask* task)
-{
-    ASSERT(!isInGC());
-    checkThread();
-    m_markingTasks.append(task);
-}
-
-void ThreadState::removeMarkingTask(MarkingTask* task)
-{
-    ASSERT(!isInGC());
-    checkThread();
-    size_t position = m_markingTasks.find(task);
-    ASSERT(position != kNotFound);
-    m_markingTasks.remove(position);
-}
-
 void ThreadState::prepareHeapForTermination()
 {
     checkThread();
     for (int i = 0; i < NumberOfHeaps; ++i)
         m_heaps[i]->prepareHeapForTermination();
 }
 
 #if ENABLE(ASSERT) || ENABLE(GC_PROFILING)
 BasePage* ThreadState::findPageFromAddress(Address address)
 {
@@ skipping 134 matching lines @@
                 TRACE_EVENT0("blink_gc", "ThreadState::threadLocalWeakProcessing");
                 // Perform thread-specific weak processing.
                 while (popAndInvokeWeakPointerCallback(Heap::s_markingVisitor)) { }
             }
             {
                 TRACE_EVENT0("blink_gc", "ThreadState::invokePreFinalizers");
                 invokePreFinalizers(*Heap::s_markingVisitor);
             }
         }
 
-        if (!m_zombies.isEmpty()) {
-            TRACE_EVENT0("blink_gc", "Heap::visitObjects");
-            // The following marking should not run in multiple threads because
-            // it uses global resources such as s_markingStack.
-            SafePointAwareMutexLocker locker(threadAttachMutex(), NoHeapPointersOnStack);
-            GCState originalState = gcState();
-            setGCState(GCRunning);
-            invokePreMarkingTasks();
-            Heap::visitObjects(this, m_zombies);
-            invokePostMarkingTasks();
-            setGCState(originalState);
-        }
-
         if (isMainThread())
             ScriptForbiddenScope::exit();
     }
 
 #if ENABLE(OILPAN)
     if (gcState() == EagerSweepScheduled) {
         // Eager sweeping should happen only in testing.
         setGCState(Sweeping);
         completeSweep();
     } else {
@@ skipping 63 matching lines @@
     checkThread();
     Vector<void*> deadObjects;
     for (auto& entry : m_preFinalizers) {
         if (entry.value(entry.key, visitor))
             deadObjects.append(entry.key);
     }
     // FIXME: removeAll is inefficient.  It can shrink repeatedly.
     m_preFinalizers.removeAll(deadObjects);
 }
 
-void ThreadState::markAsZombie(void* object)
-{
-    ASSERT(!isInGC());
-    checkThread();
-    ASSERT(!m_zombies.contains(object));
-    m_zombies.add(object);
-}
-
-void ThreadState::purifyZombies()
-{
-    m_zombies.clear();
-}
-
 #if ENABLE(GC_PROFILING)
 const GCInfo* ThreadState::findGCInfoFromAllThreads(Address address)
 {
     bool needLockForIteration = !ThreadState::current()->isInGC();
     if (needLockForIteration)
         threadAttachMutex().lock();
 
     for (ThreadState* state : attachedThreads()) {
         if (const GCInfo* gcInfo = state->findGCInfo(address)) {
             if (needLockForIteration)
@@ skipping 70 matching lines @@
         json->beginArray(it->key.ascii().data());
         for (size_t age = 0; age <= maxHeapObjectAge; ++age)
             json->pushInteger(it->value.ages[age]);
         json->endArray();
     }
     TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID(TRACE_DISABLED_BY_DEFAULT("blink_gc"), statsName, this, json.release());
 }
 #endif
 
 } // namespace blink