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.
This commit is contained in:
bors-servo 2015-03-23 23:03:45 -06:00
commit 2f85c5bb50
4 changed files with 40 additions and 0 deletions

View file

@ -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 {