Revert of Move collectGarbage* methods to ThreadState

third_party/WebKit/Source/bindings/core/v8/V8GCController.cpp

 /*
  * Copyright (C) 2009 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 333 matching lines @@
     default:
         ASSERT_NOT_REACHED();
     }
 
     if (isMainThread())
         ScriptForbiddenScope::exit();
 
     if (BlameContext* blameContext = Platform::current()->topLevelBlameContext())
         blameContext->Leave();
 
-    ThreadState* currentThreadState = ThreadState::current();
-    if (currentThreadState && !currentThreadState->isGCForbidden()) {
+    if (ThreadState::current() && !ThreadState::current()->isGCForbidden()) {
         // v8::kGCCallbackFlagForced forces a Blink heap garbage collection
         // when a garbage collection was forced from V8. This is either used
         // for tests that force GCs from JavaScript to verify that objects die
         // when expected.
         if (flags & v8::kGCCallbackFlagForced) {
             // This single GC is not enough for two reasons:
             //   (1) The GC is not precise because the GC scans on-stack pointers conservatively.
             //   (2) One GC is not enough to break a chain of persistent handles. It's possible that
             //       some heap allocated objects own objects that contain persistent handles
             //       pointing to other heap allocated objects. To break the chain, we need multiple GCs.
             //
             // Regarding (1), we force a precise GC at the end of the current event loop. So if you want
             // to collect all garbage, you need to wait until the next event loop.
             // Regarding (2), it would be OK in practice to trigger only one GC per gcEpilogue, because
             // GCController.collectAll() forces multiple V8's GC.
-            currentThreadState->collectGarbage(BlinkGC::HeapPointersOnStack, BlinkGC::GCWithSweep, BlinkGC::ForcedGC);
+            ThreadHeap::collectGarbage(BlinkGC::HeapPointersOnStack, BlinkGC::GCWithSweep, BlinkGC::ForcedGC);
 
             // Forces a precise GC at the end of the current event loop.
-            RELEASE_ASSERT(!currentThreadState->isInGC());
-            currentThreadState->setGCState(ThreadState::FullGCScheduled);
+            RELEASE_ASSERT(!ThreadState::current()->isInGC());
+            ThreadState::current()->setGCState(ThreadState::FullGCScheduled);
         }
 
         // v8::kGCCallbackFlagCollectAllAvailableGarbage is used when V8 handles
         // low memory notifications.
         if ((flags & v8::kGCCallbackFlagCollectAllAvailableGarbage)
             || (flags & v8::kGCCallbackFlagCollectAllExternalMemory)) {
             // This single GC is not enough. See the above comment.
-            currentThreadState->collectGarbage(BlinkGC::HeapPointersOnStack, BlinkGC::GCWithSweep, BlinkGC::ForcedGC);
+            ThreadHeap::collectGarbage(BlinkGC::HeapPointersOnStack, BlinkGC::GCWithSweep, BlinkGC::ForcedGC);
 
             // The conservative GC might have left floating garbage. Schedule
             // precise GC to ensure that we collect all available garbage.
-            currentThreadState->schedulePreciseGC();
+            if (ThreadState::current())
+                ThreadState::current()->schedulePreciseGC();
         }
     }
 
     TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "UpdateCounters", TRACE_EVENT_SCOPE_THREAD, "data", InspectorUpdateCountersEvent::data());
 }
 
 void V8GCController::collectGarbage(v8::Isolate* isolate)
 {
     v8::HandleScope handleScope(isolate);
     RefPtr<ScriptState> scriptState = ScriptState::create(v8::Context::New(isolate), DOMWrapperWorld::create(isolate));
@@ skipping 93 matching lines @@
     DEFINE_THREAD_SAFE_STATIC_LOCAL(CustomCountHistogram, scanPendingActivityHistogram, new CustomCountHistogram("Blink.ScanPendingActivityDuration", 1, 1000, 50));
     double startTime = WTF::currentTimeMS();
     v8::HandleScope scope(isolate);
     PendingActivityVisitor visitor(isolate, executionContext);
     toIsolate(executionContext)->VisitHandlesWithClassIds(&visitor);
     scanPendingActivityHistogram.count(static_cast<int>(WTF::currentTimeMS() - startTime));
     return visitor.pendingActivityFound();
 }
 
 } // namespace blink