3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-06-02 06:21:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

♻️ Refactor how rAF/cAF is handled (#6241)

Browse source
This commit is contained in:
Aitor Moreno 2025-04-15 15:45:28 +02:00 • committed by GitHub
parent 99e64ad387
commit 304c44048f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 45 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

8
render-wasm/src/js/wapi.js Normal file
View file

@ -0,0 +1,8 @@
addToLibrary({
wapi_requestAnimationFrame: function wapi_requestAnimationFrame() {
return window.requestAnimationFrame(Module._process_animation_frame);
},
wapi_cancelAnimationFrame: function wapi_cancelAnimationFrame(frameId) {
return window.cancelAnimationFrame(frameId);
}
});

1
render-wasm/src/main.rs
View file

@ -12,6 +12,7 @@ mod state;
mod utils;
mod uuid;
mod view;
mod wapi;
mod wasm;
use crate::mem::SerializableResult;

33
render-wasm/src/render.rs
View file

@ -4,9 +4,10 @@ use crate::uuid::Uuid;
use std::collections::HashMap;
use crate::performance;
use crate::view::Viewbox;
#[cfg(target_arch = "wasm32")]
use crate::{run_script, run_script_int};
use crate::run_script;
use crate::view::Viewbox;
use crate::wapi;
mod blend;
mod debug;
@ -433,7 +434,7 @@ impl RenderState {
) -> Result<(), String> {
if self.render_in_progress {
if let Some(frame_id) = self.render_request_id {
self.cancel_animation_frame(frame_id);
wapi::cancel_animation_frame!(frame_id);
}
}
performance::begin_measure!("render");
@ -491,28 +492,6 @@ impl RenderState {
Ok(())
}
#[cfg(target_arch = "wasm32")]
pub fn request_animation_frame(&mut self) -> i32 {
#[cfg(feature = "profile-raf")]
performance::mark!("request_animation_frame");
run_script_int!("requestAnimationFrame(_process_animation_frame)")
}
#[cfg(not(target_arch = "wasm32"))]
pub fn request_animation_frame(&mut self) -> i32 {
0
}
#[cfg(target_arch = "wasm32")]
pub fn cancel_animation_frame(&mut self, frame_id: i32) {
#[cfg(feature = "profile-raf")]
performance::mark!("cancel_animation_frame");
run_script!(format!("cancelAnimationFrame({})", frame_id))
}
#[cfg(not(target_arch = "wasm32"))]
pub fn cancel_animation_frame(&mut self, _frame_id: i32) {}
pub fn process_animation_frame(
&mut self,
tree: &mut HashMap<Uuid, Shape>,
@ -526,9 +505,9 @@ impl RenderState {
if self.render_in_progress {
if let Some(frame_id) = self.render_request_id {
self.cancel_animation_frame(frame_id);
wapi::cancel_animation_frame!(frame_id);
}
self.render_request_id = Some(self.request_animation_frame());
self.render_request_id = Some(wapi::request_animation_frame!());
} else {
performance::end_measure!("render");
}

28
render-wasm/src/wapi.rs Normal file
View file

@ -0,0 +1,28 @@
#[macro_export]
macro_rules! request_animation_frame {
() => {
#[cfg(target_arch = "wasm32")]
{
extern "C" {
pub fn wapi_requestAnimationFrame() -> i32;
}
unsafe { wapi_requestAnimationFrame() }
}
};
}
#[macro_export]
macro_rules! cancel_animation_frame {
($frame_id:expr) => {
#[cfg(target_arch = "wasm32")]
{
extern "C" {
pub fn wapi_cancelAnimationFrame(frame_id: i32);
}
unsafe { wapi_cancelAnimationFrame($frame_id) }
}
};
}
pub use cancel_animation_frame;
pub use request_animation_frame;