| Index: third_party/WebKit/Source/bindings/core/v8/V8GCController.cpp
|
| diff --git a/third_party/WebKit/Source/bindings/core/v8/V8GCController.cpp b/third_party/WebKit/Source/bindings/core/v8/V8GCController.cpp
|
| index dfb81dacb349b438f8f18604c8ee02fc1ef7be4a..c3b4cc8eb022f32066119c36b08e2de4fc941a77 100644
|
| --- a/third_party/WebKit/Source/bindings/core/v8/V8GCController.cpp
|
| +++ b/third_party/WebKit/Source/bindings/core/v8/V8GCController.cpp
|
| @@ -245,7 +245,6 @@ namespace {
|
|
|
| void visitWeakHandlesForMinorGC(v8::Isolate* isolate)
|
| {
|
| - ASSERT(isMainThread());
|
| MinorGCUnmodifiedWrapperVisitor visitor(isolate);
|
| isolate->VisitWeakHandles(&visitor);
|
| }
|
| @@ -290,10 +289,10 @@ void V8GCController::gcPrologue(v8::GCType type, v8::GCCallbackFlags flags)
|
| case v8::kGCTypeScavenge:
|
| TRACE_EVENT_BEGIN1("devtools.timeline,v8", "MinorGC", "usedHeapSizeBefore", usedHeapSize(isolate));
|
| if (isMainThread()) {
|
| - {
|
| - TRACE_EVENT_SCOPED_SAMPLING_STATE("blink", "DOMMinorGC");
|
| - visitWeakHandlesForMinorGC(isolate);
|
| - }
|
| + 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");
|
| }
|
|
|