aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/script_thread.rs
diff options
context:
space:
mode:
authorbors-servo <servo-ops@mozilla.com>2020-07-19 09:29:50 -0400
committerGitHub <noreply@github.com>2020-07-19 09:29:50 -0400
commit086556e706bbb65790e7fb9a918bf7e8051171e0 (patch)
treefa6ad280c0e2d2be02e0a75071514cb9337c3d46 /components/script/script_thread.rs
parentccff00742f42a62b3004f27fdd02cfa0b388d745 (diff)
parent419cd53561e4abaadc78b2cfea55e0bf0edfb36c (diff)
downloadservo-086556e706bbb65790e7fb9a918bf7e8051171e0.tar.gz
servo-086556e706bbb65790e7fb9a918bf7e8051171e0.zip
Auto merge of #27026 - CYBAI:dynamic-module, r=jdm
Introduce dynamic module --- - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [x] These changes fix #25439 - [x] There are tests for these changes
Diffstat (limited to 'components/script/script_thread.rs')
-rw-r--r--components/script/script_thread.rs8
1 files changed, 7 insertions, 1 deletions
diff --git a/components/script/script_thread.rs b/components/script/script_thread.rs
index c07c43b04f2..b5ea3f619a6 100644
--- a/components/script/script_thread.rs
+++ b/components/script/script_thread.rs
@@ -63,6 +63,7 @@ use crate::dom::workletglobalscope::WorkletGlobalScopeInit;
use crate::fetch::FetchCanceller;
use crate::microtask::{Microtask, MicrotaskQueue};
use crate::realms::enter_realm;
+use crate::script_module::ScriptFetchOptions;
use crate::script_runtime::{
get_reports, new_rt_and_cx, ContextForRequestInterrupt, JSContext, Runtime, ScriptPort,
};
@@ -3718,7 +3719,12 @@ impl ScriptThread {
// Script source is ready to be evaluated (11.)
let _ac = enter_realm(global_scope);
rooted!(in(*global_scope.get_cx()) let mut jsval = UndefinedValue());
- global_scope.evaluate_js_on_global_with_result(&script_source, jsval.handle_mut());
+ global_scope.evaluate_js_on_global_with_result(
+ &script_source,
+ jsval.handle_mut(),
+ ScriptFetchOptions::default_classic_script(&global_scope),
+ global_scope.api_base_url(),
+ );
load_data.js_eval_result = if jsval.get().is_string() {
unsafe {