Revision: 11227 Author: [email protected] Date: Wed Apr 4 07:34:26 2012 Log: Merged r11225 into trunk branch.
Ensure default isolate is present in Add/RemoveCallCompletedCallback. [email protected] TEST=ui_tests don't crash in Chrome Review URL: https://chromiumcodereview.appspot.com/9960010 http://code.google.com/p/v8/source/detail?r=11227 Modified: /trunk/src/api.cc /trunk/src/version.cc ======================================= --- /trunk/src/api.cc Tue Apr 3 01:37:53 2012 +++ /trunk/src/api.cc Wed Apr 4 07:34:26 2012 @@ -5279,6 +5279,7 @@ 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::RemoveCallCompletedCallback(CallCompletedCallback callback) { + i::Isolate::EnsureDefaultIsolate(); i::Isolate* isolate = i::Isolate::Current(); if (IsDeadCheck(isolate, "v8::V8::RemoveLeaveScriptCallback()")) return; i::V8::RemoveCallCompletedCallback(callback); ======================================= --- /trunk/src/version.cc Tue Apr 3 01:37:53 2012 +++ /trunk/src/version.cc Wed Apr 4 07:34:26 2012 @@ -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
