Auto merge of #14246 - emilio:servo-url, r=SimonSapin

Urlmageddon

<!-- Please describe your changes on the following line: -->

Still needs a bunch of code in net to be converted in order to get more
advantage of this for images and stuff, but meanwhile this should help quite a
bit with #13778.

Still wanted to get this in.

r? @SimonSapin

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/14246)
<!-- Reviewable:end -->

1 files changed, 7 insertions, 7 deletions

diff --git a/components/script/dom/htmlmediaelement.rs b/components/script/dom/htmlmediaelement.rs
index 09a1b7cc438..b1480391223 100644
--- a/components/script/dom/htmlmediaelement.rs
+++ b/components/script/dom/htmlmediaelement.rs
@@ -35,11 +35,11 @@ use net_traits::request::{CredentialsMode, Destination, RequestInit, Type as Req
 use network_listener::{NetworkListener, PreInvoke};
 use script_thread::{Runnable, ScriptThread};
 use servo_atoms::Atom;
+use servo_url::ServoUrl;
 use std::cell::Cell;
 use std::sync::{Arc, Mutex};
 use task_source::TaskSource;
 use time::{self, Timespec, Duration};
-use url::Url;
 
 struct HTMLMediaElementContext {
     /// The element that initiated the request.
@@ -53,7 +53,7 @@ struct HTMLMediaElementContext {
     /// Time of last progress notification.
     next_progress_event: Timespec,
     /// Url of resource requested.
-    url: Url,
+    url: ServoUrl,
     /// Whether the media metadata has been completely received.
     have_metadata: bool,
     /// True if this response is invalid and should be ignored.
@@ -164,7 +164,7 @@ impl PreInvoke for HTMLMediaElementContext {
 }
 
 impl HTMLMediaElementContext {
-    fn new(elem: &HTMLMediaElement, url: Url) -> HTMLMediaElementContext {
+    fn new(elem: &HTMLMediaElement, url: ServoUrl) -> HTMLMediaElementContext {
         HTMLMediaElementContext {
             elem: Trusted::new(elem),
             data: vec![],
@@ -437,7 +437,7 @@ impl HTMLMediaElement {
     }
 
     // https://html.spec.whatwg.org/multipage/#concept-media-load-algorithm
-    fn resource_selection_algorithm_sync(&self, base_url: Url) {
+    fn resource_selection_algorithm_sync(&self, base_url: ServoUrl) {
         // TODO step 5 (populate pending text tracks)
 
         // Step 6
@@ -814,11 +814,11 @@ impl Runnable for FireSimpleEventTask {
 
 struct ResourceSelectionTask {
     elem: Trusted<HTMLMediaElement>,
-    base_url: Url,
+    base_url: ServoUrl,
 }
 
 impl ResourceSelectionTask {
-    fn new(elem: &HTMLMediaElement, url: Url) -> ResourceSelectionTask {
+    fn new(elem: &HTMLMediaElement, url: ServoUrl) -> ResourceSelectionTask {
         ResourceSelectionTask {
             elem: Trusted::new(elem),
             base_url: url,
@@ -885,5 +885,5 @@ enum ResourceSelectionMode {
 
 enum Resource {
     Object,
-    Url(Url),
+    Url(ServoUrl),
 }