Implement requestAnimationFrame for stdweb

CHANGELOG.md

@@ -1,6 +1,8 @@
 # Unreleased
 
 - On X11, fix `ResumeTimeReached` being fired too early.
+- Added `Clone` implementation for `'static` events.
+- On Web, replaced zero timeout for `ControlFlow::Poll` with `requestAnimationFrame`
 
 # 0.22.0 (2020-03-09)
 

src/event_loop.rs

@@ -72,7 +72,8 @@ impl<T> fmt::Debug for EventLoopWindowTarget<T> {
 #[derive(Copy, Clone, Debug, PartialEq, Eq)]
 pub enum ControlFlow {
     /// When the current loop iteration finishes, immediately begin a new iteration regardless of
-    /// whether or not new events are available to process.
+    /// whether or not new events are available to process. For web, events are sent when
+    /// `requestAnimationFrame` fires.
     Poll,
     /// When the current loop iteration finishes, suspend the thread until another event arrives.
     Wait,

src/platform_impl/web/stdweb/mod.rs

@@ -3,7 +3,7 @@ mod event;
 mod timeout;
 
 pub use self::canvas::Canvas;
-pub use self::timeout::Timeout;
+pub use self::timeout::{AnimationFrameRequest, Timeout};
 
 use crate::dpi::{LogicalSize, Size};
 use crate::platform::web::WindowExtStdweb;

src/platform_impl/web/stdweb/timeout.rs

@@ -1,5 +1,7 @@
+use std::cell::Cell;
+use std::rc::Rc;
 use std::time::Duration;
-use stdweb::web::{window, IWindowOrWorker, TimeoutHandle};
+use stdweb::web::{window, IWindowOrWorker, RequestAnimationFrameHandle, TimeoutHandle};
 
 #[derive(Debug)]
 pub struct Timeout {
@@ -23,3 +25,39 @@ impl Drop for Timeout {
         handle.clear();
     }
 }
+
+#[derive(Debug)]
+pub struct AnimationFrameRequest {
+    handle: Option<RequestAnimationFrameHandle>,
+    // track callback state, because `cancelAnimationFrame` is slow
+    fired: Rc<Cell<bool>>,
+}
+
+impl AnimationFrameRequest {
+    pub fn new<F>(mut f: F) -> AnimationFrameRequest
+    where
+        F: 'static + FnMut(),
+    {
+        let fired = Rc::new(Cell::new(false));
+        let c_fired = fired.clone();
+        let handle = window().request_animation_frame(move |_| {
+            (*c_fired).set(true);
+            f();
+        });
+
+        AnimationFrameRequest {
+            handle: Some(handle),
+            fired,
+        }
+    }
+}
+
+impl Drop for AnimationFrameRequest {
+    fn drop(&mut self) {
+        if !(*self.fired).get() {
+            if let Some(handle) = self.handle.take() {
+                handle.cancel();
+            }
+        }
+    }
+}

src/platform_impl/web/web_sys/mod.rs

@@ -3,10 +3,7 @@ mod event;
 mod timeout;
 
 pub use self::canvas::Canvas;
-pub use self::timeout::{
-    Timeout,
-    AnimationFrameRequest,
-};
+pub use self::timeout::{AnimationFrameRequest, Timeout};
 
 use crate::dpi::{LogicalSize, Size};
 use crate::platform::web::WindowExtWebSys;

src/platform_impl/web/web_sys/timeout.rs

@@ -1,6 +1,6 @@
-use std::time::Duration;
-use std::rc::Rc;
 use std::cell::Cell;
+use std::rc::Rc;
+use std::time::Duration;
 use wasm_bindgen::closure::Closure;
 use wasm_bindgen::JsCast;
 
@@ -44,7 +44,7 @@ impl Drop for Timeout {
 #[derive(Debug)]
 pub struct AnimationFrameRequest {
     handle: i32,
-    // track callback state, because cancel_animation_frame is expensive
+    // track callback state, because `cancelAnimationFrame` is slow
     fired: Rc<Cell<bool>>,
     _closure: Closure<dyn FnMut()>,
 }
@@ -70,7 +70,7 @@ impl AnimationFrameRequest {
         AnimationFrameRequest {
             handle,
             fired,
-            _closure: closure
+            _closure: closure,
         }
     }
 }
@@ -79,7 +79,9 @@ impl Drop for AnimationFrameRequest {
     fn drop(&mut self) {
         if !(*self.fired).get() {
             let window = web_sys::window().expect("Failed to obtain window");
-            window.cancel_animation_frame(self.handle);
+            window
+                .cancel_animation_frame(self.handle)
+                .expect("Failed to cancel animation frame");
         }
     }
 }