diff options
author | Simon Sapin <simon.sapin@exyr.org> | 2014-07-19 18:45:11 +0100 |
---|---|---|
committer | Simon Sapin <simon.sapin@exyr.org> | 2014-07-21 20:22:29 +0100 |
commit | 6917fbf28e977f1e1da2e349b8f1685e267eb045 (patch) | |
tree | 38ad2d20aeb111fdc4eec3cd6468b9d6415d94b8 /src/components/layout/construct.rs | |
parent | 779cb44a44b195eb7a88e69a4f2e5551f85448e1 (diff) | |
download | servo-6917fbf28e977f1e1da2e349b8f1685e267eb045.tar.gz servo-6917fbf28e977f1e1da2e349b8f1685e267eb045.zip |
Used rust-url directly instead of servo_util::url
The latter now only calls the former.
Diffstat (limited to 'src/components/layout/construct.rs')
-rw-r--r-- | src/components/layout/construct.rs | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/components/layout/construct.rs b/src/components/layout/construct.rs index 27d7f480677..3764a343eae 100644 --- a/src/components/layout/construct.rs +++ b/src/components/layout/construct.rs @@ -59,7 +59,6 @@ use script::dom::node::{TextNodeTypeId}; use script::dom::htmlobjectelement::is_image_data; use servo_util::namespace; use servo_util::range::Range; -use servo_util::url::parse_url; use std::mem; use std::sync::atomics::Relaxed; use style::ComputedValues; @@ -250,7 +249,7 @@ impl<'a> FlowConstructor<'a> { IframeFragment(IframeFragmentInfo::new(node)) } Some(ElementNodeTypeId(HTMLObjectElementTypeId)) => { - let data = node.get_object_data(&self.layout_context.url); + let data = node.get_object_data(); self.build_fragment_info_for_image(node, data) } Some(ElementNodeTypeId(HTMLTableElementTypeId)) => TableWrapperFragment, @@ -1008,7 +1007,7 @@ trait ObjectElement { fn has_object_data(&self) -> bool; /// Returns the "data" attribute value parsed as a URL - fn get_object_data(&self, base_url: &Url) -> Option<Url>; + fn get_object_data(&self) -> Option<Url>; } impl<'ln> ObjectElement for ThreadSafeLayoutNode<'ln> { @@ -1024,9 +1023,9 @@ impl<'ln> ObjectElement for ThreadSafeLayoutNode<'ln> { } } - fn get_object_data(&self, base_url: &Url) -> Option<Url> { + fn get_object_data(&self) -> Option<Url> { match self.get_type_and_data() { - (None, Some(uri)) if is_image_data(uri) => Some(parse_url(uri, Some(base_url.clone()))), + (None, Some(uri)) if is_image_data(uri) => Url::parse(uri).ok(), _ => None } } |