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/htmlbodyelement.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/htmlbodyelement.rs')
| -rw-r--r-- | components/script/dom/htmlbodyelement.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/components/script/dom/htmlbodyelement.rs b/components/script/dom/htmlbodyelement.rs index e89dc21f3da..ea9b1775787 100644 --- a/components/script/dom/htmlbodyelement.rs +++ b/components/script/dom/htmlbodyelement.rs @@ -19,9 +19,9 @@ use dom::node::{Node, document_from_node, window_from_node}; use dom::virtualmethods::VirtualMethods; use html5ever_atoms::LocalName; use script_traits::ScriptMsg as ConstellationMsg; +use servo_url::ServoUrl; use style::attr::AttrValue; use time; -use url::Url; /// How long we should wait before performing the initial reflow after `<body>` is parsed, in /// nanoseconds. @@ -85,7 +85,7 @@ impl HTMLBodyElementMethods for HTMLBodyElement { pub trait HTMLBodyElementLayoutHelpers { fn get_background_color(&self) -> Option<RGBA>; fn get_color(&self) -> Option<RGBA>; - fn get_background(&self) -> Option<Url>; + fn get_background(&self) -> Option<ServoUrl>; } impl HTMLBodyElementLayoutHelpers for LayoutJS<HTMLBodyElement> { @@ -110,7 +110,7 @@ impl HTMLBodyElementLayoutHelpers for LayoutJS<HTMLBodyElement> { } #[allow(unsafe_code)] - fn get_background(&self) -> Option<Url> { + fn get_background(&self) -> Option<ServoUrl> { unsafe { (*self.upcast::<Element>().unsafe_get()) .get_attr_for_layout(&ns!(), &local_name!("background")) |