Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use Window.requestIdleCallback() #2880

Merged
merged 1 commit into from
Jun 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ And please only add new entries to the top of this list, right below the `# Unre
- On Web, fix the bfcache by not using the `beforeunload` event.
- On Web, fix scale factor resize suggestion always overwriting the canvas size.
- On macOS, fix crash when dropping `Window`.
- On Web, use `Window.requestIdleCallback()` for `ControlFlow::Poll` when available.

# 0.28.6

Expand Down
7 changes: 0 additions & 7 deletions src/event_loop.rs
Original file line number Diff line number Diff line change
Expand Up @@ -158,13 +158,6 @@ impl<T> fmt::Debug for EventLoopWindowTarget<T> {
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.
///
/// ## Platform-specific
///
/// - **Web:** Events are queued and usually sent when `requestAnimationFrame` fires but sometimes
/// the events in the queue may be sent before the next `requestAnimationFrame` callback, for
/// example when the scaling of the page has changed. This should be treated as an implementation
/// detail which should not be relied on.
Poll,

/// When the current loop iteration finishes, suspend the thread until another event arrives.
Expand Down
7 changes: 3 additions & 4 deletions src/platform_impl/web/event_loop/runner.rs
Original file line number Diff line number Diff line change
Expand Up @@ -442,10 +442,9 @@ impl<T: 'static> Shared<T> {
ControlFlow::Poll => {
let cloned = self.clone();
State::Poll {
request: backend::AnimationFrameRequest::new(
self.window().clone(),
move || cloned.poll(),
),
request: backend::IdleCallback::new(self.window().clone(), move || {
cloned.poll()
}),
}
}
ControlFlow::Wait => State::Wait {
Expand Down
2 changes: 1 addition & 1 deletion src/platform_impl/web/event_loop/state.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ pub enum State {
start: Instant,
},
Poll {
request: backend::AnimationFrameRequest,
request: backend::IdleCallback,
},
Exit,
}
Expand Down
2 changes: 1 addition & 1 deletion src/platform_impl/web/web_sys/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ mod timeout;
pub use self::canvas::Canvas;
pub use self::event::ButtonsState;
pub use self::scaling::ScaleChangeDetector;
pub use self::timeout::{AnimationFrameRequest, Timeout};
pub use self::timeout::{IdleCallback, Timeout};

use crate::dpi::{LogicalSize, Size};
use crate::platform::web::WindowExtWebSys;
Expand Down
66 changes: 53 additions & 13 deletions src/platform_impl/web/web_sys/timeout.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
use once_cell::unsync::OnceCell;
use std::cell::Cell;
use std::rc::Rc;
use std::time::Duration;
use wasm_bindgen::closure::Closure;
use wasm_bindgen::prelude::wasm_bindgen;
use wasm_bindgen::JsCast;
use wasm_bindgen::JsValue;

#[derive(Debug)]
pub struct Timeout {
Expand Down Expand Up @@ -40,16 +43,21 @@ impl Drop for Timeout {
}

#[derive(Debug)]
pub struct AnimationFrameRequest {
pub struct IdleCallback {
window: web_sys::Window,
handle: i32,
// track callback state, because `cancelAnimationFrame` is slow
handle: Handle,
fired: Rc<Cell<bool>>,
_closure: Closure<dyn FnMut()>,
}

impl AnimationFrameRequest {
pub fn new<F>(window: web_sys::Window, mut f: F) -> AnimationFrameRequest
#[derive(Clone, Copy, Debug)]
enum Handle {
IdleCallback(u32),
Timeout(i32),
}

impl IdleCallback {
pub fn new<F>(window: web_sys::Window, mut f: F) -> IdleCallback
where
F: 'static + FnMut(),
{
Expand All @@ -60,11 +68,21 @@ impl AnimationFrameRequest {
f();
}) as Box<dyn FnMut()>);

let handle = window
.request_animation_frame(closure.as_ref().unchecked_ref())
.expect("Failed to request animation frame");
let handle = if has_idle_callback_support(&window) {
Handle::IdleCallback(
window
.request_idle_callback(closure.as_ref().unchecked_ref())
.expect("Failed to request idle callback"),
)
} else {
Handle::Timeout(
window
.set_timeout_with_callback(closure.as_ref().unchecked_ref())
.expect("Failed to set timeout"),
)
};

AnimationFrameRequest {
IdleCallback {
window,
handle,
fired,
Expand All @@ -73,12 +91,34 @@ impl AnimationFrameRequest {
}
}

impl Drop for AnimationFrameRequest {
impl Drop for IdleCallback {
fn drop(&mut self) {
if !(*self.fired).get() {
self.window
.cancel_animation_frame(self.handle)
.expect("Failed to cancel animation frame");
match self.handle {
Handle::IdleCallback(handle) => self.window.cancel_idle_callback(handle),
Handle::Timeout(handle) => self.window.clear_timeout_with_handle(handle),
}
}
}
}

fn has_idle_callback_support(window: &web_sys::Window) -> bool {
thread_local! {
static IDLE_CALLBACK_SUPPORT: OnceCell<bool> = OnceCell::new();
}
daxpedda marked this conversation as resolved.
Show resolved Hide resolved

IDLE_CALLBACK_SUPPORT.with(|support| {
*support.get_or_init(|| {
#[wasm_bindgen]
extern "C" {
type IdleCallbackSupport;

#[wasm_bindgen(method, getter, js_name = requestIdleCallback)]
fn has_request_idle_callback(this: &IdleCallbackSupport) -> JsValue;
}

let support: &IdleCallbackSupport = window.unchecked_ref();
!support.has_request_idle_callback().is_undefined()
})
})
}