diff options
author | Ms2ger <Ms2ger@gmail.com> | 2016-11-02 15:48:23 +0100 |
---|---|---|
committer | Ms2ger <Ms2ger@gmail.com> | 2016-11-24 11:46:24 +0100 |
commit | fb1279ec3a97c16b17ee9ae3add69152029a4bc0 (patch) | |
tree | ecdaf182c5a1748a38238f5e70b5885e531a81bd /components/net/chrome_loader.rs | |
parent | ce24edc2b363389c3af138622e5ac88d1dd09d2c (diff) | |
download | servo-fb1279ec3a97c16b17ee9ae3add69152029a4bc0.tar.gz servo-fb1279ec3a97c16b17ee9ae3add69152029a4bc0.zip |
Remove CoreResourceMsg::Load.
Also remove now-dead code that rustc warns about.
It turns out that we lost support for some of our custom URL schemes; I intend
to reimplement them, but I believe this will be significantly easier to do
once the legacy code is out of the way.
Diffstat (limited to 'components/net/chrome_loader.rs')
-rw-r--r-- | components/net/chrome_loader.rs | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/components/net/chrome_loader.rs b/components/net/chrome_loader.rs index 5e14d130fb1..6ddb096548a 100644 --- a/components/net/chrome_loader.rs +++ b/components/net/chrome_loader.rs @@ -2,13 +2,8 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -use file_loader; -use mime_classifier::MimeClassifier; -use net_traits::{LoadConsumer, LoadData, NetworkError}; -use resource_thread::{CancellationListener, send_error}; use servo_url::ServoUrl; use std::fs::canonicalize; -use std::sync::Arc; use url::percent_encoding::percent_decode; use util::resource_files::resources_dir_path; @@ -34,20 +29,3 @@ pub fn resolve_chrome_url(url: &ServoUrl) -> Result<ServoUrl, ()> { _ => Err(()) } } - -pub fn factory(mut load_data: LoadData, - start_chan: LoadConsumer, - classifier: Arc<MimeClassifier>, - cancel_listener: CancellationListener) { - let file_url = match resolve_chrome_url(&load_data.url) { - Ok(url) => url, - Err(_) => { - send_error(load_data.url, - NetworkError::Internal("Invalid chrome URL.".to_owned()), - start_chan); - return; - } - }; - load_data.url = file_url; - file_loader::factory(load_data, start_chan, classifier, cancel_listener) -} |