Reviewers: Vitaly Repeshko, Description: Merge r8987 into 3.2 branch, fixing a Chrome 12 startup issue.
Please review this at http://codereview.chromium.org/7693025/ SVN Base: http://v8.googlecode.com/svn/branches/3.2/ Affected files: M src/api.cc M src/version.cc Index: src/api.cc =================================================================== --- src/api.cc (revision 8987) +++ src/api.cc (working copy) @@ -3779,7 +3779,7 @@ v8::Local<v8::Context> Context::GetEntered() { i::Isolate* isolate = i::Isolate::Current(); - if (IsDeadCheck(isolate, "v8::Context::GetEntered()")) { + if (!EnsureInitializedForIsolate(isolate, "v8::Context::GetEntered()")) { return Local<Context>(); } i::Handle<i::Object> last = Index: src/version.cc =================================================================== --- src/version.cc (revision 8987) +++ src/version.cc (working copy) @@ -35,7 +35,7 @@ #define MAJOR_VERSION 3 #define MINOR_VERSION 2 #define BUILD_NUMBER 10 -#define PATCH_LEVEL 37 +#define PATCH_LEVEL 38 // 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
