auto merge of #5333 : glennw/servo/fix-iframe-subpage, r=jdm

This fixes the case of clicking a link in an iframe, going back, then clicking the link again.

1 files changed, 5 insertions, 0 deletions

diff --git a/components/script/dom/htmliframeelement.rs b/components/script/dom/htmliframeelement.rs
index ec532c7b695..64a0f2db7a7 100644
--- a/components/script/dom/htmliframeelement.rs
+++ b/components/script/dom/htmliframeelement.rs
@@ -73,6 +73,7 @@ pub trait HTMLIFrameElementHelpers {
     fn generate_new_subpage_id(self) -> (SubpageId, Option<SubpageId>);
     fn navigate_child_browsing_context(self, url: Url);
     fn dispatch_mozbrowser_event(self, event_name: String, event_detail: Option<String>);
+    fn update_subpage_id(self, new_subpage_id: SubpageId);
 }
 
 impl<'a> HTMLIFrameElementHelpers for JSRef<'a, HTMLIFrameElement> {
@@ -156,6 +157,10 @@ impl<'a> HTMLIFrameElementHelpers for JSRef<'a, HTMLIFrameElement> {
             event.fire(target);
         }
     }
+
+    fn update_subpage_id(self, new_subpage_id: SubpageId) {
+        self.subpage_id.set(Some(new_subpage_id));
+    }
 }
 
 impl HTMLIFrameElement {