diff options
| author | Josh Matthews <josh@joshmatthews.net> | 2014-12-30 16:52:13 -0500 |
|---|---|---|
| committer | Josh Matthews <josh@joshmatthews.net> | 2015-02-04 13:34:06 +0000 |
| commit | ae2b74c783da97068f438097453fb8e63beb02d8 (patch) | |
| tree | 4eba54204f2815f1ba0a491c014655400867807e /components/script/dom/document.rs | |
| parent | 19fbb9e568c6011abcfe883538ce03d9d2f42995 (diff) | |
| download | servo-ae2b74c783da97068f438097453fb8e63beb02d8.tar.gz servo-ae2b74c783da97068f438097453fb8e63beb02d8.zip | |
Make Document::url return the page's URL to avoid stale URLs after redirects.
Diffstat (limited to 'components/script/dom/document.rs')
| -rw-r--r-- | components/script/dom/document.rs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs index b6a5659a88a..a8161c62640 100644 --- a/components/script/dom/document.rs +++ b/components/script/dom/document.rs @@ -170,7 +170,7 @@ pub trait DocumentHelpers<'a> { fn window(self) -> Temporary<Window>; fn encoding_name(self) -> Ref<'a, DOMString>; fn is_html_document(self) -> bool; - fn url(self) -> &'a Url; + fn url(self) -> Url; fn quirks_mode(self) -> QuirksMode; fn set_quirks_mode(self, mode: QuirksMode); fn set_last_modified(self, value: DOMString); @@ -206,8 +206,9 @@ impl<'a> DocumentHelpers<'a> for JSRef<'a, Document> { self.is_html_document } - fn url(self) -> &'a Url { - &self.extended_deref().url + fn url(self) -> Url { + let window = self.window().root(); + window.page().get_url() } fn quirks_mode(self) -> QuirksMode { |