diff options
author | Julien Enselme <julien.enselme@centrale-marseille.fr> | 2016-09-18 10:28:36 +0200 |
---|---|---|
committer | Julien Enselme <julien.enselme@centrale-marseille.fr> | 2016-09-19 10:29:05 +0200 |
commit | 9adda6e38da0988c8898a690fed46066608ab08d (patch) | |
tree | c3dd039c9a9e9c70f1c5005a0bfdcea847bdb9fe /components/script/dom | |
parent | 83f687a7be2d4cdda11f5ec03133c23d6d621e78 (diff) | |
download | servo-9adda6e38da0988c8898a690fed46066608ab08d.tar.gz servo-9adda6e38da0988c8898a690fed46066608ab08d.zip |
Decode UTF-8 with from_utf8_lossy in DedicatedWorkerGlobalScope
Diffstat (limited to 'components/script/dom')
-rw-r--r-- | components/script/dom/dedicatedworkerglobalscope.rs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/components/script/dom/dedicatedworkerglobalscope.rs b/components/script/dom/dedicatedworkerglobalscope.rs index 2314d94f15b..589489debce 100644 --- a/components/script/dom/dedicatedworkerglobalscope.rs +++ b/components/script/dom/dedicatedworkerglobalscope.rs @@ -173,20 +173,20 @@ impl DedicatedWorkerGlobalScope { let roots = RootCollection::new(); let _stack_roots_tls = StackRootTLS::new(&roots); - let (url, source) = match load_whole_resource(LoadContext::Script, - &init.resource_threads.sender(), - worker_url, - &worker_load_origin) { + let (metadata, bytes) = match load_whole_resource(LoadContext::Script, + &init.resource_threads.sender(), + worker_url, + &worker_load_origin) { Err(_) => { println!("error loading script {}", serialized_worker_url); parent_sender.send(CommonScriptMsg::RunnableMsg(WorkerEvent, box SimpleWorkerErrorHandler::new(worker))).unwrap(); return; } - Ok((metadata, bytes)) => { - (metadata.final_url, String::from_utf8(bytes).unwrap()) - } + Ok((metadata, bytes)) => (metadata, bytes) }; + let url = metadata.final_url; + let source = String::from_utf8_lossy(&bytes); let runtime = unsafe { new_rt_and_cx() }; *worker_rt_for_mainthread.lock().unwrap() = Some(SharedRt::new(&runtime)); |