Index: src/api.cc |
diff --git a/src/api.cc b/src/api.cc |
index bd62d102d1599e19b0fd8a6361a1f6ba3f4ce1b9..71dcde793b7a404048c80aeba884e566e4035830 100644 |
--- a/src/api.cc |
+++ b/src/api.cc |
@@ -106,7 +106,7 @@ namespace v8 { |
#define EXCEPTION_BAILOUT_CHECK_DO_CALLBACK(isolate, value) \ |
EXCEPTION_BAILOUT_CHECK_GENERIC( \ |
- isolate, value, i::V8::FireCallCompletedCallback(isolate);) |
+ isolate, value, isolate->FireCallCompletedCallback();) |
#define EXCEPTION_BAILOUT_CHECK(isolate, value) \ |
@@ -6491,12 +6491,6 @@ void V8::RemoveMemoryAllocationCallback(MemoryAllocationCallback callback) { |
} |
-void V8::AddCallCompletedCallback(CallCompletedCallback callback) { |
- if (callback == NULL) return; |
- i::V8::AddCallCompletedCallback(callback); |
-} |
- |
- |
void V8::RunMicrotasks(Isolate* isolate) { |
i::Isolate* i_isolate = reinterpret_cast<i::Isolate*>(isolate); |
i::HandleScope scope(i_isolate); |
@@ -6516,11 +6510,6 @@ void V8::SetAutorunMicrotasks(Isolate* isolate, bool autorun) { |
} |
-void V8::RemoveCallCompletedCallback(CallCompletedCallback callback) { |
- i::V8::RemoveCallCompletedCallback(callback); |
-} |
- |
- |
void V8::TerminateExecution(Isolate* isolate) { |
reinterpret_cast<i::Isolate*>(isolate)->stack_guard()->TerminateExecution(); |
} |
@@ -6669,14 +6658,14 @@ void Isolate::SetEventLogger(LogEventCallback that) { |
void Isolate::AddCallCompletedCallback(CallCompletedCallback callback) { |
if (callback == NULL) return; |
- // TODO(jochen): Make this per isolate. |
- i::V8::AddCallCompletedCallback(callback); |
+ i::Isolate* isolate = reinterpret_cast<i::Isolate*>(this); |
+ isolate->AddCallCompletedCallback(callback); |
} |
void Isolate::RemoveCallCompletedCallback(CallCompletedCallback callback) { |
- // TODO(jochen): Make this per isolate. |
- i::V8::RemoveCallCompletedCallback(callback); |
+ i::Isolate* isolate = reinterpret_cast<i::Isolate*>(this); |
+ isolate->RemoveCallCompletedCallback(callback); |
} |