aboutsummaryrefslogtreecommitdiffstats
path: root/components/net_traits/lib.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_traits/lib.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_traits/lib.rs')
-rw-r--r--components/net_traits/lib.rs22
1 files changed, 21 insertions, 1 deletions
diff --git a/components/net_traits/lib.rs b/components/net_traits/lib.rs
index c338002c19a..dcd85c3af72 100644
--- a/components/net_traits/lib.rs
+++ b/components/net_traits/lib.rs
@@ -28,6 +28,7 @@ extern crate util;
extern crate uuid;
extern crate websocket;
+use filemanager_thread::FileManagerThreadMsg;
use heapsize::HeapSizeOf;
use hyper::header::{ContentType, Headers};
use hyper::http::RawStatus;
@@ -217,8 +218,13 @@ pub type CoreResourceThread = IpcSender<CoreResourceMsg>;
pub type IpcSendResult = Result<(), IOError>;
+/// Abstraction of the ability to send a particular type of message,
+/// used by net_traits::ResourceThreads to ease the use its IpcSender sub-fields
+/// XXX: If this trait will be used more in future, some auto derive might be appealing
pub trait IpcSend<T> where T: serde::Serialize + serde::Deserialize {
+ /// send message T
fn send(&self, T) -> IpcSendResult;
+ /// get underlying sender
fn sender(&self) -> IpcSender<T>;
}
@@ -231,13 +237,17 @@ pub trait IpcSend<T> where T: serde::Serialize + serde::Deserialize {
pub struct ResourceThreads {
core_thread: CoreResourceThread,
storage_thread: IpcSender<StorageThreadMsg>,
+ filemanager_thread: IpcSender<FileManagerThreadMsg>,
}
impl ResourceThreads {
- pub fn new(c: CoreResourceThread, s: IpcSender<StorageThreadMsg>) -> ResourceThreads {
+ pub fn new(c: CoreResourceThread,
+ s: IpcSender<StorageThreadMsg>,
+ f: IpcSender<FileManagerThreadMsg>) -> ResourceThreads {
ResourceThreads {
core_thread: c,
storage_thread: s,
+ filemanager_thread: f,
}
}
}
@@ -262,6 +272,16 @@ impl IpcSend<StorageThreadMsg> for ResourceThreads {
}
}
+impl IpcSend<FileManagerThreadMsg> for ResourceThreads {
+ fn send(&self, msg: FileManagerThreadMsg) -> IpcSendResult {
+ self.filemanager_thread.send(msg)
+ }
+
+ fn sender(&self) -> IpcSender<FileManagerThreadMsg> {
+ self.filemanager_thread.clone()
+ }
+}
+
// Ignore the sub-fields
impl HeapSizeOf for ResourceThreads {
fn heap_size_of_children(&self) -> usize { 0 }