Index: src/compiler.cc |
diff --git a/src/compiler.cc b/src/compiler.cc |
index a0e93d79619a332f0eb285aeaa4872f7bcd993ad..54a0903196f372af7d5e6d51ed7a37b35d00b314 100644 |
--- a/src/compiler.cc |
+++ b/src/compiler.cc |
@@ -1185,9 +1185,9 @@ |
Handle<SharedFunctionInfo> Compiler::CompileScript( |
Handle<String> source, Handle<Object> script_name, int line_offset, |
- int column_offset, ScriptOriginOptions resource_options, |
- Handle<Object> source_map_url, Handle<Context> context, |
- v8::Extension* extension, ScriptData** cached_data, |
+ int column_offset, bool is_embedder_debug_script, |
+ bool is_shared_cross_origin, Handle<Object> source_map_url, |
+ Handle<Context> context, v8::Extension* extension, ScriptData** cached_data, |
ScriptCompiler::CompileOptions compile_options, NativesFlag natives, |
bool is_module) { |
Isolate* isolate = source->GetIsolate(); |
@@ -1222,8 +1222,9 @@ |
if (extension == NULL) { |
// First check per-isolate compilation cache. |
maybe_result = compilation_cache->LookupScript( |
- source, script_name, line_offset, column_offset, resource_options, |
- context, language_mode); |
+ source, script_name, line_offset, column_offset, |
+ is_embedder_debug_script, is_shared_cross_origin, context, |
+ language_mode); |
if (maybe_result.is_null() && FLAG_serialize_toplevel && |
compile_options == ScriptCompiler::kConsumeCodeCache && |
!isolate->debug()->is_loaded()) { |
@@ -1260,7 +1261,8 @@ |
script->set_line_offset(Smi::FromInt(line_offset)); |
script->set_column_offset(Smi::FromInt(column_offset)); |
} |
- script->set_origin_options(resource_options); |
+ script->set_is_shared_cross_origin(is_shared_cross_origin); |
+ script->set_is_embedder_debug_script(is_embedder_debug_script); |
if (!source_map_url.is_null()) { |
script->set_source_mapping_url(*source_map_url); |
} |