Index: src/api.cc |
diff --git a/src/api.cc b/src/api.cc |
index c8a9e90821a1ced337c8b3ddfed526f7c6cfc69f..f152175e0b5ed0c15a2b82eed0fb3311c484be16 100644 |
--- a/src/api.cc |
+++ b/src/api.cc |
@@ -768,8 +768,8 @@ void Context::SetData(v8::Handle<String> data) { |
i::Isolate* isolate = env->GetIsolate(); |
if (IsDeadCheck(isolate, "v8::Context::SetData()")) return; |
i::Handle<i::Object> raw_data = Utils::OpenHandle(*data); |
- ASSERT(env->IsNativeContext()); |
- if (env->IsNativeContext()) { |
+ ASSERT(env->IsGlobalContext()); |
+ if (env->IsGlobalContext()) { |
env->set_data(*raw_data); |
} |
} |
@@ -782,8 +782,8 @@ v8::Local<v8::Value> Context::GetData() { |
return v8::Local<Value>(); |
} |
i::Object* raw_result = NULL; |
- ASSERT(env->IsNativeContext()); |
- if (env->IsNativeContext()) { |
+ ASSERT(env->IsGlobalContext()); |
+ if (env->IsGlobalContext()) { |
raw_result = env->data(); |
} else { |
return Local<Value>(); |
@@ -1067,6 +1067,7 @@ static i::Handle<i::AccessorInfo> MakeAccessorInfo( |
v8::PropertyAttribute attributes, |
v8::Handle<AccessorSignature> signature) { |
i::Handle<i::AccessorInfo> obj = FACTORY->NewAccessorInfo(); |
+ ASSERT(getter != NULL); |
SET_FIELD_WRAPPED(obj, set_getter, getter); |
SET_FIELD_WRAPPED(obj, set_setter, setter); |
if (data.IsEmpty()) data = v8::Undefined(); |
@@ -1574,7 +1575,7 @@ Local<Script> Script::Compile(v8::Handle<String> source, |
i::Handle<i::JSFunction> result = |
isolate->factory()->NewFunctionFromSharedFunctionInfo( |
function, |
- isolate->native_context()); |
+ isolate->global_context()); |
return Local<Script>(ToApi<Script>(result)); |
} |
@@ -1601,7 +1602,7 @@ Local<Value> Script::Run() { |
i::Handle<i::SharedFunctionInfo> |
function_info(i::SharedFunctionInfo::cast(*obj), isolate); |
fun = isolate->factory()->NewFunctionFromSharedFunctionInfo( |
- function_info, isolate->native_context()); |
+ function_info, isolate->global_context()); |
} else { |
fun = i::Handle<i::JSFunction>(i::JSFunction::cast(*obj), isolate); |
} |
@@ -3269,7 +3270,7 @@ static i::Context* GetCreationContext(i::JSObject* object) { |
} else { |
function = i::JSFunction::cast(constructor); |
} |
- return function->context()->native_context(); |
+ return function->context()->global_context(); |
} |
@@ -4438,7 +4439,7 @@ void v8::Context::UseDefaultSecurityToken() { |
} |
ENTER_V8(isolate); |
i::Handle<i::Context> env = Utils::OpenHandle(this); |
- env->set_security_token(env->global_object()); |
+ env->set_security_token(env->global()); |
} |
@@ -4483,7 +4484,7 @@ v8::Local<v8::Context> Context::GetCurrent() { |
if (IsDeadCheck(isolate, "v8::Context::GetCurrent()")) { |
return Local<Context>(); |
} |
- i::Handle<i::Object> current = isolate->native_context(); |
+ i::Handle<i::Object> current = isolate->global_context(); |
if (current.is_null()) return Local<Context>(); |
i::Handle<i::Context> context = i::Handle<i::Context>::cast(current); |
return Utils::ToLocal(context); |
@@ -4496,7 +4497,7 @@ v8::Local<v8::Context> Context::GetCalling() { |
return Local<Context>(); |
} |
i::Handle<i::Object> calling = |
- isolate->GetCallingNativeContext(); |
+ isolate->GetCallingGlobalContext(); |
if (calling.is_null()) return Local<Context>(); |
i::Handle<i::Context> context = i::Handle<i::Context>::cast(calling); |
return Utils::ToLocal(context); |
@@ -5797,7 +5798,7 @@ Local<Value> Debug::GetMirror(v8::Handle<v8::Value> obj) { |
v8::HandleScope scope; |
i::Debug* isolate_debug = isolate->debug(); |
isolate_debug->Load(); |
- i::Handle<i::JSObject> debug(isolate_debug->debug_context()->global_object()); |
+ i::Handle<i::JSObject> debug(isolate_debug->debug_context()->global()); |
i::Handle<i::String> name = |
isolate->factory()->LookupAsciiSymbol("MakeMirror"); |
i::Handle<i::Object> fun_obj = i::GetProperty(debug, name); |