diff options
| author | Ben Murdoch <benm@google.com> | 2011-08-26 11:05:41 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-08-26 11:06:48 +0100 |
| commit | afcf6d0da905bea0fdfb8b2c48629777819d4370 (patch) | |
| tree | b59b2f84fd0609e9f9baaf16d1c18b4125d255ba /src | |
| parent | 42effa50d92d47f80404ee63808dbde9921e6202 (diff) | |
| download | android_external_v8-afcf6d0da905bea0fdfb8b2c48629777819d4370.tar.gz android_external_v8-afcf6d0da905bea0fdfb8b2c48629777819d4370.tar.bz2 android_external_v8-afcf6d0da905bea0fdfb8b2c48629777819d4370.zip | |
Merge V8 at r8988: Roll to 3.2.10.38
Bug: 5188807
Change-Id: Id08b2a350e03890f20ff215d45829ac4de3c44cd
Diffstat (limited to 'src')
| -rw-r--r-- | src/api.cc | 2 | ||||
| -rw-r--r-- | src/version.cc | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -3779,7 +3779,7 @@ bool Context::InContext() { 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 = diff --git a/src/version.cc b/src/version.cc index 9c8de04d..e42f77c5 100644 --- a/src/version.cc +++ b/src/version.cc @@ -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 |