diff options
Diffstat (limited to 'components/script')
| -rw-r--r-- | components/script/dom/htmliframeelement.rs | 11 | ||||
| -rw-r--r-- | components/script/script_task.rs | 2 |
2 files changed, 9 insertions, 4 deletions
diff --git a/components/script/dom/htmliframeelement.rs b/components/script/dom/htmliframeelement.rs index 72a38ce8c89..c7fdb9eb075 100644 --- a/components/script/dom/htmliframeelement.rs +++ b/components/script/dom/htmliframeelement.rs @@ -90,7 +90,7 @@ impl HTMLIFrameElement { (subpage_id, old_subpage_id) } - pub fn navigate_child_browsing_context(&self, url: Url) { + pub fn navigate_or_reload_child_browsing_context(&self, url: Option<Url>) { let sandboxed = if self.is_sandboxed() { IFrameSandboxed } else { @@ -127,7 +127,7 @@ impl HTMLIFrameElement { None => url!("about:blank"), }; - self.navigate_child_browsing_context(url); + self.navigate_or_reload_child_browsing_context(Some(url)); } #[allow(unsafe_code)] @@ -399,7 +399,12 @@ impl HTMLIFrameElementMethods for HTMLIFrameElement { // https://developer.mozilla.org/en-US/docs/Web/API/HTMLIFrameElement/reload fn Reload(&self, _hardReload: bool) -> Fallible<()> { - Err(Error::NotSupported) + if mozbrowser_enabled() { + if self.upcast::<Node>().is_in_doc() { + self.navigate_or_reload_child_browsing_context(None); + } + } + Ok(()) } // https://developer.mozilla.org/en-US/docs/Web/API/HTMLIFrameElement/stop diff --git a/components/script/script_task.rs b/components/script/script_task.rs index a3cff5b0835..04500ac5738 100644 --- a/components/script/script_task.rs +++ b/components/script/script_task.rs @@ -1922,7 +1922,7 @@ impl ScriptTask { doc.find_iframe(subpage_id) }); if let Some(iframe) = iframe.r() { - iframe.navigate_child_browsing_context(load_data.url); + iframe.navigate_or_reload_child_browsing_context(Some(load_data.url)); } } None => { |