Revision: 8988
Author: [email protected]
Date: Mon Aug 22 06:29:53 2011
Log: Merge r8987 into 3.2 branch, fixing a Chrome 12 startup issue.
Review URL: http://codereview.chromium.org/7693025
http://code.google.com/p/v8/source/detail?r=8988
Modified:
/branches/3.2
/branches/3.2/src/api.cc
/branches/3.2/src/version.cc
=======================================
--- /branches/3.2/src/api.cc Thu Aug 4 10:37:58 2011
+++ /branches/3.2/src/api.cc Mon Aug 22 06:29:53 2011
@@ -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 =
=======================================
--- /branches/3.2/src/version.cc Fri Aug 12 07:27:06 2011
+++ /branches/3.2/src/version.cc Mon Aug 22 06:29:53 2011
@@ -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
