diff options
author | Anthony Ramine <n.oxyde@gmail.com> | 2015-05-19 20:05:28 +0200 |
---|---|---|
committer | Anthony Ramine <n.oxyde@gmail.com> | 2015-05-26 15:35:19 +0200 |
commit | 178f696df341e12e373217bae2c5673192b89c6e (patch) | |
tree | 1ea3f15ce409aeff51cd253a80cc3ada52286f00 | |
parent | 22931145ab12b32886c5a743c2f337700cd7dc6f (diff) | |
download | servo-178f696df341e12e373217bae2c5673192b89c6e.tar.gz servo-178f696df341e12e373217bae2c5673192b89c6e.zip |
Optimise use of RootedVec in ScriptTask::handle_event()
-rw-r--r-- | components/script/script_task.rs | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/components/script/script_task.rs b/components/script/script_task.rs index b114819c613..5d26ef23010 100644 --- a/components/script/script_task.rs +++ b/components/script/script_task.rs @@ -88,6 +88,7 @@ use std::any::Any; use std::borrow::ToOwned; use std::cell::{Cell, RefCell}; use std::collections::HashSet; +use std::mem; use std::option::Option; use std::ptr; use std::rc::Rc; @@ -1340,11 +1341,12 @@ impl ScriptTask { } let page = get_page(&self.root_page(), pipeline_id); let document = page.document().root(); + // We temporarily steal the list of targets over which the mouse is to pass it to + // handle_mouse_move_event() in a safe RootedVec container. let mut mouse_over_targets = RootedVec::new(); - mouse_over_targets.append(&mut *self.mouse_over_targets.borrow_mut()); - + mem::swap(&mut *self.mouse_over_targets.borrow_mut(), &mut *mouse_over_targets); document.r().handle_mouse_move_event(self.js_runtime.rt(), point, &mut mouse_over_targets); - *self.mouse_over_targets.borrow_mut() = mouse_over_targets.clone(); + mem::swap(&mut *self.mouse_over_targets.borrow_mut(), &mut *mouse_over_targets); } KeyEvent(key, state, modifiers) => { |