diff options
Diffstat (limited to 'components/script')
| -rw-r--r-- | components/script/dom/bindings/trace.rs | 4 | ||||
| -rw-r--r-- | components/script/dom/htmliframeelement.rs | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/components/script/dom/bindings/trace.rs b/components/script/dom/bindings/trace.rs index f71c2b83ef1..6331a1c3bf3 100644 --- a/components/script/dom/bindings/trace.rs +++ b/components/script/dom/bindings/trace.rs @@ -57,7 +57,7 @@ use js::jsapi::{GCTraceKindToAscii, Heap, JSObject, JSTracer, TraceKind}; use js::jsval::JSVal; use js::rust::Runtime; use libc; -use msg::constellation_msg::{FrameType, PipelineId, ReferrerPolicy, WindowSizeType}; +use msg::constellation_msg::{FrameId, FrameType, PipelineId, ReferrerPolicy, WindowSizeType}; use net_traits::{Metadata, NetworkError, ResourceThreads}; use net_traits::filemanager_thread::RelativePos; use net_traits::image::base::{Image, ImageMetadata}; @@ -308,7 +308,7 @@ no_jsmanaged_fields!(PropertyDeclarationBlock); no_jsmanaged_fields!(HashSet<T>); // These three are interdependent, if you plan to put jsmanaged data // in one of these make sure it is propagated properly to containing structs -no_jsmanaged_fields!(FrameType, WindowSizeData, WindowSizeType, PipelineId); +no_jsmanaged_fields!(FrameId, FrameType, WindowSizeData, WindowSizeType, PipelineId); no_jsmanaged_fields!(TimerEventId, TimerSource); no_jsmanaged_fields!(WorkerId); no_jsmanaged_fields!(QuirksMode); 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), |