diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-04-15 10:03:51 +0530 |
|---|---|---|
| committer | bors-servo <lbergstrom+bors@mozilla.com> | 2016-04-15 10:03:51 +0530 |
| commit | 7faa3ed9cb87ebfa62554940e916bb7e4d04512b (patch) | |
| tree | 20db1eb0917a11a63aa886fd74a98ff9f5e8e0fa /components/script | |
| parent | 7bd23815184bfa675bde040231199722c703d2f0 (diff) | |
| parent | 52c6fd5b03539454488dedcdb6dc99a3e8bf5a5c (diff) | |
| download | servo-7faa3ed9cb87ebfa62554940e916bb7e4d04512b.tar.gz servo-7faa3ed9cb87ebfa62554940e916bb7e4d04512b.zip | |
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 -->
Diffstat (limited to 'components/script')
| -rw-r--r-- | components/script/dom/htmliframeelement.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/components/script/dom/htmliframeelement.rs b/components/script/dom/htmliframeelement.rs index 3824d981af1..fc339664833 100644 --- a/components/script/dom/htmliframeelement.rs +++ b/components/script/dom/htmliframeelement.rs @@ -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() } }) } |