diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-11-17 15:34:47 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-17 15:34:47 -0600 |
| commit | 22aebdf5d41a3509cd6515ccf5edcdf33715a76d (patch) | |
| tree | 824af410d147404d0a6dc0908cec85cc71df5bfd /components/script/dom/xmldocument.rs | |
| parent | b3ad71353bf264770bf0b3a87b32d86928eb09d4 (diff) | |
| parent | 913c874cb55fd0fdc9e8f3a4c34624cd015fac8a (diff) | |
| download | servo-22aebdf5d41a3509cd6515ccf5edcdf33715a76d.tar.gz servo-22aebdf5d41a3509cd6515ccf5edcdf33715a76d.zip | |
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 -->
Diffstat (limited to 'components/script/dom/xmldocument.rs')
| -rw-r--r-- | components/script/dom/xmldocument.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/components/script/dom/xmldocument.rs b/components/script/dom/xmldocument.rs index 9ed694c84e9..191b142dbea 100644 --- a/components/script/dom/xmldocument.rs +++ b/components/script/dom/xmldocument.rs @@ -16,7 +16,7 @@ use dom::location::Location; use dom::node::Node; use dom::window::Window; use js::jsapi::{JSContext, JSObject}; -use url::Url; +use servo_url::ServoUrl; // https://dom.spec.whatwg.org/#xmldocument #[dom_struct] @@ -27,7 +27,7 @@ pub struct XMLDocument { impl XMLDocument { fn new_inherited(window: &Window, browsing_context: Option<&BrowsingContext>, - url: Option<Url>, + url: Option<ServoUrl>, is_html_document: IsHTMLDocument, content_type: Option<DOMString>, last_modified: Option<String>, @@ -49,7 +49,7 @@ impl XMLDocument { pub fn new(window: &Window, browsing_context: Option<&BrowsingContext>, - url: Option<Url>, + url: Option<ServoUrl>, doctype: IsHTMLDocument, content_type: Option<DOMString>, last_modified: Option<String>, |