Reviewers: ulan,

Description:
Merged r11233 into trunk branch.

Ensure default isolate is present in Context::New().

BUG=chromium:118686

[email protected]


Please review this at https://chromiumcodereview.appspot.com/10009007/

SVN Base: https://v8.googlecode.com/svn/trunk

Affected files:
  M src/api.cc
  M src/version.cc


Index: src/api.cc
diff --git a/src/api.cc b/src/api.cc
index 3c54b4bdb2e7988ae8f57c559b746b55e9e0da16..bb9ba2350af2e258dab1a0097275d1443245a785 100644
--- a/src/api.cc
+++ b/src/api.cc
@@ -4287,6 +4287,7 @@ Persistent<Context> v8::Context::New(
     v8::ExtensionConfiguration* extensions,
     v8::Handle<ObjectTemplate> global_template,
     v8::Handle<Value> global_object) {
+  i::Isolate::EnsureDefaultIsolate();
   i::Isolate* isolate = i::Isolate::Current();
   EnsureInitializedForIsolate(isolate, "v8::Context::New()");
   LOG_API(isolate, "Context::New");
Index: src/version.cc
diff --git a/src/version.cc b/src/version.cc
index 19a72f55de7345fd4a9b0b93cab1ca430eaa9192..a93048c66205440eb5092e222a4721cd2becd2c6 100644
--- a/src/version.cc
+++ b/src/version.cc
@@ -35,7 +35,7 @@
 #define MAJOR_VERSION     3
 #define MINOR_VERSION     10
 #define BUILD_NUMBER      0
-#define PATCH_LEVEL       4
+#define PATCH_LEVEL       5
 // Use 1 for candidates and 0 otherwise.
 // (Boolean macro values are not supported by all preprocessors.)
 #define IS_CANDIDATE_VERSION 0


--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev

Reply via email to