servo: Merge #4842 - Implement window.frameElement, change window.parent to make use of it (from glennw:window-frameelement); r=jdm

Source-Repo: https://github.com/servo/servo Source-Revision: d0f61f4f85acda3da2f0bbcccc5949f185f94373
2015-02-07 04:51:41 -07:00
parent 41187bae96
commit 7788241b2b
8 changed files with 88 additions and 67 deletions
--- a/servo/components/msg/constellation_msg.rs
+++ b/servo/components/msg/constellation_msg.rs
@@ -36,7 +36,7 @@ pub enum IFrameSandboxState {
 #[derive(Clone, Copy)]
 pub struct Failure {
    pub pipeline_id: PipelineId,
-    pub subpage_id: Option<SubpageId>,
+    pub parent: Option<(PipelineId, SubpageId)>,
 }

 #[derive(Copy)]