diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-05-03 16:42:46 -0700 |
---|---|---|
committer | bors-servo <lbergstrom+bors@mozilla.com> | 2016-05-03 16:42:46 -0700 |
commit | f9d9cd3aaed3326e8935f710f800288a50156c71 (patch) | |
tree | bdb10d2e66d82a73a46cdc53d62febaaec24da4d /components/script/document_loader.rs | |
parent | 2c69278067a23703b251a69c875bee49449c6bfc (diff) | |
parent | f16c05423c75fc166db9790d91ac06d7a105ca03 (diff) | |
download | servo-f9d9cd3aaed3326e8935f710f800288a50156c71.tar.gz servo-f9d9cd3aaed3326e8935f710f800288a50156c71.zip |
Auto merge of #8454 - jdm:media, r=KiChjang
Implement basic <media> infrastructure
This gets us to the point where we can start playing with actually integrating rust-media to process the data received by the network request, as currently it's just ignored.
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8454)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/document_loader.rs')
-rw-r--r-- | components/script/document_loader.rs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/components/script/document_loader.rs b/components/script/document_loader.rs index 6032d91b440..cd1f806294e 100644 --- a/components/script/document_loader.rs +++ b/components/script/document_loader.rs @@ -21,6 +21,7 @@ pub enum LoadType { Subframe(Url), Stylesheet(Url), PageSource(Url), + Media(Url), } impl LoadType { @@ -30,6 +31,7 @@ impl LoadType { LoadType::Script(ref url) | LoadType::Subframe(ref url) | LoadType::Stylesheet(ref url) | + LoadType::Media(ref url) | LoadType::PageSource(ref url) => url, } } @@ -39,7 +41,8 @@ impl LoadType { LoadType::Image(_) => LoadContext::Image, LoadType::Script(_) => LoadContext::Script, LoadType::Subframe(_) | LoadType::PageSource(_) => LoadContext::Browsing, - LoadType::Stylesheet(_) => LoadContext::Style + LoadType::Stylesheet(_) => LoadContext::Style, + LoadType::Media(_) => LoadContext::AudioVideo, } } } |