Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 12:40:06 +01:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

10
components/compositing/constellation.rs
View file

@ -597,6 +597,16 @@ impl<LTF: LayoutTaskFactory, STF: ScriptTaskFactory> Constellation<LTF, STF> {
// Set paint permissions correctly for the compositor layers.
self.revoke_paint_permission(prev_pipeline_id);
self.send_frame_tree_and_grant_paint_permission();
// Update the owning iframe to point to the new subpage id.
// This makes things like contentDocument work correctly.
if let Some((parent_pipeline_id, subpage_id)) = pipeline_info {
let ScriptControlChan(ref script_chan) = self.pipeline(parent_pipeline_id).script_chan;
let (_, new_subpage_id) = self.pipeline(next_pipeline_id).parent_info.unwrap();
script_chan.send(ConstellationControlMsg::UpdateSubpageId(parent_pipeline_id,
subpage_id,
new_subpage_id)).unwrap();
}
}
fn handle_key_msg(&self, key: Key, state: KeyState, mods: KeyModifiers) {