Reviewers: ulan,
Description:
Merged r11225 into trunk branch.
Ensure default isolate is present in Add/RemoveCallCompletedCallback.
[email protected]
TEST=ui_tests don't crash in Chrome
Please review this at https://chromiumcodereview.appspot.com/9960010/
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
ee106a9e9316ec3b734b2735cd3b1ff39f15ef0b..3c54b4bdb2e7988ae8f57c559b746b55e9e0da16
100644
--- a/src/api.cc
+++ b/src/api.cc
@@ -5279,6 +5279,7 @@ void
V8::RemoveMemoryAllocationCallback(MemoryAllocationCallback callback) {
void V8::AddCallCompletedCallback(CallCompletedCallback callback) {
if (callback == NULL) return;
+ i::Isolate::EnsureDefaultIsolate();
i::Isolate* isolate = i::Isolate::Current();
if (IsDeadCheck(isolate, "v8::V8::AddLeaveScriptCallback()")) return;
i::V8::AddCallCompletedCallback(callback);
@@ -5286,6 +5287,7 @@ void
V8::AddCallCompletedCallback(CallCompletedCallback callback) {
void V8::RemoveCallCompletedCallback(CallCompletedCallback callback) {
+ i::Isolate::EnsureDefaultIsolate();
i::Isolate* isolate = i::Isolate::Current();
if (IsDeadCheck(isolate, "v8::V8::RemoveLeaveScriptCallback()")) return;
i::V8::RemoveCallCompletedCallback(callback);
Index: src/version.cc
diff --git a/src/version.cc b/src/version.cc
index
bf0784035ff93e633d247ef3303e34a4ffcbf4c8..19a72f55de7345fd4a9b0b93cab1ca430eaa9192
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 3
+#define PATCH_LEVEL 4
// 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
