Oilpan: Remove synchronous completeSweep() from V8's minor GC prologue

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 273 matching lines @@
 void V8GCController::gcPrologue(v8::Isolate* isolate, v8::GCType type, v8::GCCallbackFlags flags)
 {
     if (isMainThread())
         ScriptForbiddenScope::enter();
 
     // TODO(haraken): A GC callback is not allowed to re-enter V8. This means
     // that it's unsafe to run Oilpan's GC in the GC callback because it may
     // run finalizers that call into V8. To avoid the risk, we should post
     // a task to schedule the Oilpan's GC.
     // (In practice, there is no finalizer that calls into V8 and thus is safe.)
-    if (ThreadState::current())
-        ThreadState::current()->willStartV8GC();
 
     v8::HandleScope scope(isolate);
     switch (type) {
     case v8::kGCTypeScavenge:
+        if (ThreadState::current())
+            ThreadState::current()->willStartV8GC(BlinkGC::V8MinorGC);
+
         TRACE_EVENT_BEGIN1("devtools.timeline,v8", "MinorGC", "usedHeapSizeBefore", usedHeapSize(isolate));
         if (isMainThread()) {
             TRACE_EVENT_SCOPED_SAMPLING_STATE("blink", "DOMMinorGC");
         }
         visitWeakHandlesForMinorGC(isolate);
         if (isMainThread()) {
             V8PerIsolateData::from(isolate)->setPreviousSamplingState(TRACE_EVENT_GET_SAMPLING_STATE());
             TRACE_EVENT_SET_SAMPLING_STATE("v8", "V8MinorGC");
         }
         break;
     case v8::kGCTypeMarkSweepCompact:
+        if (ThreadState::current())
+            ThreadState::current()->willStartV8GC(BlinkGC::V8MajorGC);
+
         TRACE_EVENT_BEGIN2("devtools.timeline,v8", "MajorGC", "usedHeapSizeBefore", usedHeapSize(isolate), "type", "atomic pause");
         gcPrologueForMajorGC(isolate, flags & v8::kGCCallbackFlagConstructRetainedObjectInfos);
         break;
     case v8::kGCTypeIncrementalMarking:
+        if (ThreadState::current())
+            ThreadState::current()->willStartV8GC(BlinkGC::V8MajorGC);
+
         TRACE_EVENT_BEGIN2("devtools.timeline,v8", "MajorGC", "usedHeapSizeBefore", usedHeapSize(isolate), "type", "incremental marking");
         gcPrologueForMajorGC(isolate, flags & v8::kGCCallbackFlagConstructRetainedObjectInfos);
         break;
     case v8::kGCTypeProcessWeakCallbacks:
         TRACE_EVENT_BEGIN2("devtools.timeline,v8", "MajorGC", "usedHeapSizeBefore", usedHeapSize(isolate), "type", "weak processing");
         if (isMainThread()) {
             V8PerIsolateData::from(isolate)->setPreviousSamplingState(TRACE_EVENT_GET_SAMPLING_STATE());
             TRACE_EVENT_SET_SAMPLING_STATE("blink", "DOMMajorGC");
         }
         break;
@@ skipping 128 matching lines @@
     Visitor* m_visitor;
 };
 
 void V8GCController::traceDOMWrappers(v8::Isolate* isolate, Visitor* visitor)
 {
     DOMWrapperTracer tracer(visitor);
     isolate->VisitHandlesWithClassIds(&tracer);
 }
 
 } // namespace blink