Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6)

Unified Diff: src/api.cc

Issue 25697002: Revert "lazy instantiation of the default isolate" and "build fix for 17049". (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | src/isolate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/api.cc
diff --git a/src/api.cc b/src/api.cc
index 734a7e9db88f94933a61712cff0d73c5884937d4..11eaf924a27c88decff9fb87f820ef846473572b 100644
--- a/src/api.cc
+++ b/src/api.cc
@@ -5007,13 +5007,14 @@ void v8::V8::SetArrayBufferAllocator(
bool v8::V8::Dispose() {
- i::Isolate* isolate = i::Isolate::UncheckedCurrent();
- if (!ApiCheck(isolate == NULL || isolate->IsDefaultIsolate(),
+ i::Isolate* isolate = i::Isolate::Current();
+ if (!ApiCheck(isolate != NULL && isolate->IsDefaultIsolate(),
"v8::V8::Dispose()",
"Use v8::Isolate::Dispose() for a non-default isolate.")) {
return false;
}
- return i::V8::TearDown();
+ i::V8::TearDown();
+ return true;
}
@@ -6487,10 +6488,6 @@ void V8::CancelTerminateExecution(Isolate* isolate) {
Isolate* Isolate::GetCurrent() {
i::Isolate* isolate = i::Isolate::UncheckedCurrent();
- if (isolate == NULL) {
- isolate = i::Isolate::EnsureDefaultIsolate(true);
- ASSERT(isolate == i::Isolate::UncheckedCurrent());
- }
return reinterpret_cast<Isolate*>(isolate);
}
« no previous file with comments | « no previous file | src/isolate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698