diff options
author | Simon Sapin <simon.sapin@exyr.org> | 2014-07-21 20:23:02 +0100 |
---|---|---|
committer | Simon Sapin <simon.sapin@exyr.org> | 2014-07-21 20:23:02 +0100 |
commit | 3670ee6f1fc5066101cc5a357443494552ea37f2 (patch) | |
tree | 3fa174faace875c0f8bb83cb4f1668f46141948c /src/components/script/dom/htmliframeelement.rs | |
parent | f07d999463fd80ec55cef9e673a1dc08954b6d74 (diff) | |
parent | b84065f5749b42792c4c7b890be23e81651beab5 (diff) | |
download | servo-3670ee6f1fc5066101cc5a357443494552ea37f2.tar.gz servo-3670ee6f1fc5066101cc5a357443494552ea37f2.zip |
Merge pull request #2875 from SimonSapin/rust-url
Start dogfooding rust-url
Diffstat (limited to 'src/components/script/dom/htmliframeelement.rs')
-rw-r--r-- | src/components/script/dom/htmliframeelement.rs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/components/script/dom/htmliframeelement.rs b/src/components/script/dom/htmliframeelement.rs index 83638ad44e1..31a41b9f956 100644 --- a/src/components/script/dom/htmliframeelement.rs +++ b/src/components/script/dom/htmliframeelement.rs @@ -21,11 +21,10 @@ use servo_msg::constellation_msg::{IFrameSandboxed, IFrameUnsandboxed}; use servo_msg::constellation_msg::{ConstellationChan, LoadIframeUrlMsg}; use servo_util::namespace::Null; use servo_util::str::DOMString; -use servo_util::url::try_parse_url; use std::ascii::StrAsciiExt; use std::cell::Cell; -use url::Url; +use url::{Url, UrlParser}; enum SandboxAllowance { AllowNothing = 0x00, @@ -70,8 +69,8 @@ impl<'a> HTMLIFrameElementHelpers for JSRef<'a, HTMLIFrameElement> { let element: &JSRef<Element> = ElementCast::from_ref(self); element.get_attribute(Null, "src").root().and_then(|src| { let window = window_from_node(self).root(); - try_parse_url(src.deref().value().as_slice(), - Some(window.deref().page().get_url())).ok() + UrlParser::new().base_url(&window.deref().page().get_url()) + .parse(src.deref().value().as_slice()).ok() }) } } |