aboutsummaryrefslogtreecommitdiffstats
path: root/components/net/resource_thread.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2016-05-23 01:10:46 -0700
committerbors-servo <lbergstrom+bors@mozilla.com>2016-05-23 01:10:46 -0700
commit7cea4eb01ce3b84ca276ca417d933fb122005b51 (patch)
tree3b408b5ee27733159e8ce8b54dfc09838ebbfc17 /components/net/resource_thread.rs
parentaa9fc4e0549c54fafef358a50f32f520c9014ba6 (diff)
parentdd590d088b036e06dd5775237e04ac45de3b1488 (diff)
downloadservo-7cea4eb01ce3b84ca276ca417d933fb122005b51.tar.gz
servo-7cea4eb01ce3b84ca276ca417d933fb122005b51.zip
Auto merge of #11225 - izgzhen:patch-input-element-file, r=Manishearth
Implement file related functionalities in htmlinputelement and related - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy --faster` does not report any errors - [x] These changes is related to #11131 - [x] These changes do not require tests because it is a partial implementation 1. Improve the `filemanager_thread` by adding type string and create `SelectedFile` 2. Fill several gaps in `htmlinputelement` implementation related to file type 3. Improve the `File` interface to accommodate the above changes 4. Integrate changes introduced by PR #11189 <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/11225) <!-- Reviewable:end -->
Diffstat (limited to 'components/net/resource_thread.rs')
-rw-r--r--components/net/resource_thread.rs4
1 files changed, 3 insertions, 1 deletions
diff --git a/components/net/resource_thread.rs b/components/net/resource_thread.rs
index 7e93901a740..43919362bfa 100644
--- a/components/net/resource_thread.rs
+++ b/components/net/resource_thread.rs
@@ -11,6 +11,7 @@ use cookie_storage::CookieStorage;
use data_loader;
use devtools_traits::{DevtoolsControlMsg};
use file_loader;
+use filemanager_thread::FileManagerThreadFactory;
use hsts::HstsList;
use http_loader::{self, HttpState};
use hyper::client::pool::Pool;
@@ -154,7 +155,8 @@ pub fn new_resource_threads(user_agent: String,
devtools_chan: Option<Sender<DevtoolsControlMsg>>,
profiler_chan: ProfilerChan) -> ResourceThreads {
ResourceThreads::new(new_core_resource_thread(user_agent, devtools_chan, profiler_chan),
- StorageThreadFactory::new())
+ StorageThreadFactory::new(),
+ FileManagerThreadFactory::new())
}