Auto merge of #10626 - sliz1:10576, r=KiChjang

Use the document base url when resolving iframe URLs

Fixes #10576.

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10626)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-04-15 10:03:51 +05:30
commit 7faa3ed9cb
4 changed files with 5473 additions and 3 deletions

View file

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