From 3d46f6749daa1d0d95d89f4cdcad33c00a28d137 Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Wed, 21 Feb 2018 22:54:12 +0100 Subject: [PATCH] Remove a use of rooted_vec in Document::handle_touch_event --- components/script/dom/document.rs | 42 +++++++++++++++---------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs index abe67fc343f..e7ade7bf8da 100644 --- a/components/script/dom/document.rs +++ b/components/script/dom/document.rs @@ -1176,29 +1176,29 @@ impl Document { } } - rooted_vec!(let mut touches); - touches.extend(self.active_touch_points.borrow().iter().cloned()); rooted_vec!(let mut target_touches); - target_touches.extend(self.active_touch_points - .borrow() - .iter() - .filter(|t| t.Target() == target) - .cloned()); + let touches = { + let touches = self.active_touch_points.borrow(); + target_touches.extend(touches.iter().filter(|t| t.Target() == target).cloned()); + TouchList::new(window, touches.r()) + }; - let event = TouchEvent::new(window, - DOMString::from(event_name), - EventBubbles::Bubbles, - EventCancelable::Cancelable, - Some(window), - 0i32, - &TouchList::new(window, touches.r()), - &TouchList::new(window, ref_slice(&&*touch)), - &TouchList::new(window, target_touches.r()), - // FIXME: modifier keys - false, - false, - false, - false); + let event = TouchEvent::new( + window, + DOMString::from(event_name), + EventBubbles::Bubbles, + EventCancelable::Cancelable, + Some(window), + 0i32, + &touches, + &TouchList::new(window, ref_slice(&&*touch)), + &TouchList::new(window, target_touches.r()), + // FIXME: modifier keys + false, + false, + false, + false, + ); let event = event.upcast::(); let result = event.fire(&target);