aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/script_task.rs
diff options
context:
space:
mode:
authorJosh Matthews <josh@joshmatthews.net>2015-12-14 18:59:03 -0500
committerJosh Matthews <josh@joshmatthews.net>2015-12-14 18:59:03 -0500
commit397d748f9d2c8f8b132dd7a922307ae92c2cc557 (patch)
treee60b8d153ce93428c7fdc1b2c54ad2d8cc0ba952 /components/script/script_task.rs
parentd11f96e27074b0130760a02d39d2da4e003c820e (diff)
downloadservo-397d748f9d2c8f8b132dd7a922307ae92c2cc557.tar.gz
servo-397d748f9d2c8f8b132dd7a922307ae92c2cc557.zip
Ensure that grandchild same-origin iframes are added to the children of the child iframe of the root. Resolves #8973.
Diffstat (limited to 'components/script/script_task.rs')
-rw-r--r--components/script/script_task.rs3
1 files changed, 2 insertions, 1 deletions
diff --git a/components/script/script_task.rs b/components/script/script_task.rs
index 3c54259fc3e..84c9629ff86 100644
--- a/components/script/script_task.rs
+++ b/components/script/script_task.rs
@@ -1594,7 +1594,8 @@ impl ScriptTask {
let parent_page = self.root_page();
// TODO(gw): This find will fail when we are sharing script tasks
// between cross origin iframes in the same TLD.
- parent_page.find(parent).expect("received load for subpage with missing parent");
+ let parent_page = parent_page.find(parent)
+ .expect("received load for subpage with missing parent");
parent_page.children.borrow_mut().push(page.clone());
}