servo: Merge #10626 - Use the document base url when resolving iframe URLs (from sliz1:10576); r=KiChjang

Fixes #10576.

Source-Repo: https://github.com/servo/servo
Source-Revision: 7faa3ed9cb87ebfa62554940e916bb7e4d04512b
This commit is contained in:
Stephen (Ziyun) Li
2016-04-15 09:33:51 +05:00
parent 270b0cf6fa
commit e600320d13

View File

@@ -82,8 +82,7 @@ impl HTMLIFrameElement {
if url.is_empty() { if url.is_empty() {
None None
} else { } else {
let window = window_from_node(self); document_from_node(self).base_url().join(&url).ok()
window.get_url().join(&url).ok()
} }
}) })
} }