diff options
author | Paul Rouget <me@paulrouget.com> | 2018-04-11 16:04:07 +0800 |
---|---|---|
committer | Paul Rouget <me@paulrouget.com> | 2018-04-27 15:34:52 +0800 |
commit | 9fb5795f3720bc090b221ed0850fb95b24704cb7 (patch) | |
tree | 02ae3fa1c77a85930dec490d57e1c907b287a562 /components/script/dom/userscripts.rs | |
parent | 21517504cb95c969e8eb9f5e97273b98f9237a7d (diff) | |
download | servo-9fb5795f3720bc090b221ed0850fb95b24704cb7.tar.gz servo-9fb5795f3720bc090b221ed0850fb95b24704cb7.zip |
delegate resource reading to embedder
Diffstat (limited to 'components/script/dom/userscripts.rs')
-rw-r--r-- | components/script/dom/userscripts.rs | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/components/script/dom/userscripts.rs b/components/script/dom/userscripts.rs index fd5ae5f023e..e2db3e4cfe0 100644 --- a/components/script/dom/userscripts.rs +++ b/components/script/dom/userscripts.rs @@ -8,7 +8,6 @@ use dom::htmlheadelement::HTMLHeadElement; use dom::node::Node; use js::jsval::UndefinedValue; use servo_config::opts; -use servo_config::resource_files::resources_dir_path; use std::fs::{File, read_dir}; use std::io::Read; use std::path::PathBuf; @@ -22,17 +21,7 @@ pub fn load_script(head: &HTMLHeadElement) { let cx = win.get_cx(); rooted!(in(cx) let mut rval = UndefinedValue()); - let path = if &**path_str == "" { - if let Ok(mut p) = resources_dir_path() { - p.push("user-agent-js"); - p - } else { - return - } - } else { - PathBuf::from(path_str) - }; - + let path = PathBuf::from(path_str); let mut files = read_dir(&path).expect("Bad path passed to --userscripts") .filter_map(|e| e.ok()) .map(|e| e.path()).collect::<Vec<_>>(); |