diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-05-23 01:10:46 -0700 |
---|---|---|
committer | bors-servo <lbergstrom+bors@mozilla.com> | 2016-05-23 01:10:46 -0700 |
commit | 7cea4eb01ce3b84ca276ca417d933fb122005b51 (patch) | |
tree | 3b408b5ee27733159e8ce8b54dfc09838ebbfc17 /components/script/dom/bindings/trace.rs | |
parent | aa9fc4e0549c54fafef358a50f32f520c9014ba6 (diff) | |
parent | dd590d088b036e06dd5775237e04ac45de3b1488 (diff) | |
download | servo-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/script/dom/bindings/trace.rs')
-rw-r--r-- | components/script/dom/bindings/trace.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/components/script/dom/bindings/trace.rs b/components/script/dom/bindings/trace.rs index 1acb5ee9e4b..4c6941a5f5e 100644 --- a/components/script/dom/bindings/trace.rs +++ b/components/script/dom/bindings/trace.rs @@ -60,7 +60,7 @@ use net_traits::image::base::{Image, ImageMetadata}; use net_traits::image_cache_thread::{ImageCacheChan, ImageCacheThread}; use net_traits::response::HttpsState; use net_traits::storage_thread::StorageType; -use net_traits::{Metadata, NetworkError}; +use net_traits::{Metadata, NetworkError, ResourceThreads}; use offscreen_gl_context::GLLimits; use profile_traits::mem::ProfilerChan as MemProfilerChan; use profile_traits::time::ProfilerChan as TimeProfilerChan; @@ -321,6 +321,7 @@ no_jsmanaged_fields!(HttpsState); no_jsmanaged_fields!(SharedRt); no_jsmanaged_fields!(TouchpadPressurePhase); no_jsmanaged_fields!(ReferrerPolicy); +no_jsmanaged_fields!(ResourceThreads); impl JSTraceable for Box<ScriptChan + Send> { #[inline] |