aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/htmliframeelement.rs
diff options
context:
space:
mode:
authorMathieu Agopian <mathieu@agopian.info>2015-12-18 17:02:41 +0100
committerMathieu Agopian <mathieu@agopian.info>2015-12-18 17:02:41 +0100
commit11234f5370631550e925e6357881ac0dea11a120 (patch)
treee9a75b941acec5e5b3ff3f6ed8559e24fa282ab7 /components/script/dom/htmliframeelement.rs
parent6764cf0ee9ce78d2d3498aec18e633e20455e050 (diff)
downloadservo-11234f5370631550e925e6357881ac0dea11a120.tar.gz
servo-11234f5370631550e925e6357881ac0dea11a120.zip
Use Url.join instead of UrlParser.base_url(...).parse (#9002)
Diffstat (limited to 'components/script/dom/htmliframeelement.rs')
-rw-r--r--components/script/dom/htmliframeelement.rs5
1 files changed, 2 insertions, 3 deletions
diff --git a/components/script/dom/htmliframeelement.rs b/components/script/dom/htmliframeelement.rs
index c7fdb9eb075..34d668d7c80 100644
--- a/components/script/dom/htmliframeelement.rs
+++ b/components/script/dom/htmliframeelement.rs
@@ -32,7 +32,7 @@ use script_traits::ScriptMsg as ConstellationMsg;
use std::ascii::AsciiExt;
use std::cell::Cell;
use string_cache::Atom;
-use url::{Url, UrlParser};
+use url::Url;
use util::prefs;
use util::str::DOMString;
use util::str::{self, LengthOrPercentageOrAuto};
@@ -74,8 +74,7 @@ impl HTMLIFrameElement {
None
} else {
let window = window_from_node(self);
- UrlParser::new().base_url(&window.get_url())
- .parse(&url).ok()
+ window.get_url().join(&url).ok()
}
})
}