Index: src/handles.cc |
=================================================================== |
--- src/handles.cc (revision 539) |
+++ src/handles.cc (working copy) |
@@ -62,11 +62,11 @@ |
} |
-Handle<JSGlobalObject> ReinitializeJSGlobalObject( |
+Handle<JSGlobalProxy> ReinitializeJSGlobalProxy( |
Handle<JSFunction> constructor, |
- Handle<JSGlobalObject> global) { |
- CALL_HEAP_FUNCTION(Heap::ReinitializeJSGlobalObject(*constructor, *global), |
- JSGlobalObject); |
+ Handle<JSGlobalProxy> global) { |
+ CALL_HEAP_FUNCTION(Heap::ReinitializeJSGlobalProxy(*constructor, *global), |
+ JSGlobalProxy); |
} |
@@ -485,7 +485,6 @@ |
ASSERT(index >= 0); |
Handle<Context> compile_context(Context::cast(info->get(1))); |
Handle<Context> function_context(Context::cast(info->get(2))); |
- Handle<Context> security_context(Context::cast(info->get(3))); |
Handle<Object> receiver(compile_context->global()->builtins()); |
Vector<const char> name = Natives::GetScriptName(index); |
@@ -520,7 +519,6 @@ |
if (!Debug::debug_context().is_null() && |
Top::context() == *Debug::debug_context()) { |
Top::set_context(*compile_context); |
- Top::set_security_context(*security_context); |
} |
// Reset the lazy load data before running the script to make sure |
@@ -540,13 +538,11 @@ |
void SetupLazy(Handle<JSFunction> fun, |
int index, |
Handle<Context> compile_context, |
- Handle<Context> function_context, |
- Handle<Context> security_context) { |
- Handle<FixedArray> arr = Factory::NewFixedArray(4); |
+ Handle<Context> function_context) { |
+ Handle<FixedArray> arr = Factory::NewFixedArray(3); |
arr->set(0, Smi::FromInt(index)); |
arr->set(1, *compile_context); // Compile in this context |
arr->set(2, *function_context); // Set function context to this |
- arr->set(3, *security_context); // Receiver for call |
fun->shared()->set_lazy_load_data(*arr); |
} |