diff options
author | Alan Jeffrey <ajeffrey@mozilla.com> | 2016-09-28 19:45:39 -0500 |
---|---|---|
committer | Alan Jeffrey <ajeffrey@mozilla.com> | 2016-10-07 14:11:32 -0500 |
commit | f53408df80e08ca33d29e664b8512d2696d818fa (patch) | |
tree | db26dbefbf5d972fee2a097b1e5b2b9b00c51746 /components/script/dom/htmliframeelement.rs | |
parent | 86f31d0dc7d94f5c836380e22f2cdf0411dcb2a1 (diff) | |
download | servo-f53408df80e08ca33d29e664b8512d2696d818fa.tar.gz servo-f53408df80e08ca33d29e664b8512d2696d818fa.zip |
IFrame elements now manage FrameIds rather than the constellation.
Diffstat (limited to 'components/script/dom/htmliframeelement.rs')
-rw-r--r-- | components/script/dom/htmliframeelement.rs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/components/script/dom/htmliframeelement.rs b/components/script/dom/htmliframeelement.rs index 75d828e73c9..3a8e4c126f3 100644 --- a/components/script/dom/htmliframeelement.rs +++ b/components/script/dom/htmliframeelement.rs @@ -38,7 +38,7 @@ use dom::window::{ReflowReason, Window}; use ipc_channel::ipc; use js::jsapi::{JSAutoCompartment, JSContext, MutableHandleValue}; use js::jsval::{NullValue, UndefinedValue}; -use msg::constellation_msg::{FrameType, LoadData, PipelineId, TraversalDirection}; +use msg::constellation_msg::{FrameType, FrameId, LoadData, PipelineId, TraversalDirection}; use net_traits::response::HttpsState; use script_layout_interface::message::ReflowQueryType; use script_traits::{IFrameLoadInfo, MozBrowserEvent, ScriptMsg as ConstellationMsg}; @@ -67,6 +67,7 @@ bitflags! { #[dom_struct] pub struct HTMLIFrameElement { htmlelement: HTMLElement, + frame_id: FrameId, pipeline_id: Cell<Option<PipelineId>>, sandbox: MutNullableHeap<JS<DOMTokenList>>, sandbox_allowance: Cell<Option<SandboxAllowance>>, @@ -130,6 +131,7 @@ impl HTMLIFrameElement { let load_info = IFrameLoadInfo { load_data: load_data, parent_pipeline_id: global_scope.pipeline_id(), + frame_id: self.frame_id, old_pipeline_id: old_pipeline_id, new_pipeline_id: new_pipeline_id, sandbox: sandboxed, @@ -181,6 +183,7 @@ impl HTMLIFrameElement { document: &Document) -> HTMLIFrameElement { HTMLIFrameElement { htmlelement: HTMLElement::new_inherited(local_name, prefix, document), + frame_id: FrameId::new(), pipeline_id: Cell::new(None), sandbox: Default::default(), sandbox_allowance: Cell::new(None), |