From 52c6fd5b03539454488dedcdb6dc99a3e8bf5a5c Mon Sep 17 00:00:00 2001
From: "Stephen (Ziyun) Li" <stephen.liziyun@gmail.com>
Date: Thu, 14 Apr 2016 22:48:31 -0400
Subject: Use the document base url when resolving iframe URLs

---
 components/script/dom/htmliframeelement.rs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'components/script')

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()
             }
         })
     }
-- 
cgit v1.2.3