diff options
Diffstat (limited to 'components/script/script_thread.rs')
| -rw-r--r-- | components/script/script_thread.rs | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/components/script/script_thread.rs b/components/script/script_thread.rs index ad8c3d09e57..680bf2e8c9a 100644 --- a/components/script/script_thread.rs +++ b/components/script/script_thread.rs @@ -32,7 +32,7 @@ use dom::bindings::codegen::Bindings::TransitionEventBinding::TransitionEventIni use dom::bindings::codegen::Bindings::WindowBinding::WindowMethods; use dom::bindings::conversions::{ConversionResult, FromJSValConvertible, StringificationBehavior}; use dom::bindings::inheritance::Castable; -use dom::bindings::js::{JS, MutNullableHeap, Root, RootCollection}; +use dom::bindings::js::{JS, MutNullableJS, Root, RootCollection}; use dom::bindings::js::{RootCollectionPtr, RootedReference}; use dom::bindings::num::Finite; use dom::bindings::refcounted::Trusted; @@ -461,7 +461,7 @@ pub struct ScriptThread { js_runtime: Rc<Runtime>, /// The topmost element over the mouse. - topmost_mouse_over_target: MutNullableHeap<JS<Element>>, + topmost_mouse_over_target: MutNullableJS<Element>, /// List of pipelines that have been owned and closed by this script thread. closed_pipelines: DOMRefCell<HashSet<PipelineId>>, @@ -686,7 +686,7 @@ impl ScriptThread { devtools_sender: ipc_devtools_sender, js_runtime: Rc::new(runtime), - topmost_mouse_over_target: MutNullableHeap::new(Default::default()), + topmost_mouse_over_target: MutNullableJS::new(Default::default()), closed_pipelines: DOMRefCell::new(HashSet::new()), scheduler_chan: state.scheduler_chan, @@ -946,7 +946,9 @@ impl ScriptThread { ScriptThreadEventCategory::TimerEvent => ProfilerCategory::ScriptTimerEvent, ScriptThreadEventCategory::WebSocketEvent => ProfilerCategory::ScriptWebSocketEvent, ScriptThreadEventCategory::WorkerEvent => ProfilerCategory::ScriptWorkerEvent, - ScriptThreadEventCategory::ServiceWorkerEvent => ProfilerCategory::ScriptServiceWorkerEvent + ScriptThreadEventCategory::ServiceWorkerEvent => ProfilerCategory::ScriptServiceWorkerEvent, + ScriptThreadEventCategory::EnterFullscreen => ProfilerCategory::ScriptEnterFullscreen, + ScriptThreadEventCategory::ExitFullscreen => ProfilerCategory::ScriptExitFullscreen, }; profile(profiler_cat, None, self.time_profiler_chan.clone(), f) } else { |