mirror of
https://github.com/GraphiteEditor/Graphite.git
synced 2026-09-25 16:48:11 +08:00
Desktop: Refactor window state to not require locking (#2928)
* Replace window state with channels and improve resize performance * Move Cef Handler into the cef module * Reuse textures * Test cef scheduling * Schedule self render if texture is outdated * Address review comments
This commit is contained in:
+55
-4
@@ -1,5 +1,8 @@
|
||||
use crate::FrameBuffer;
|
||||
use std::time::Instant;
|
||||
use crate::{CustomEvent, FrameBuffer};
|
||||
use std::{
|
||||
sync::{Arc, Mutex, mpsc::Receiver},
|
||||
time::Instant,
|
||||
};
|
||||
|
||||
mod context;
|
||||
mod dirs;
|
||||
@@ -8,16 +11,17 @@ mod internal;
|
||||
mod scheme_handler;
|
||||
|
||||
pub(crate) use context::{Context, InitError, Initialized, Setup, SetupError};
|
||||
use winit::event_loop::EventLoopProxy;
|
||||
|
||||
pub(crate) trait CefEventHandler: Clone {
|
||||
fn window_size(&self) -> WindowSize;
|
||||
fn draw(&self, frame_buffer: FrameBuffer) -> bool;
|
||||
fn draw(&self, frame_buffer: FrameBuffer);
|
||||
/// Scheudule the main event loop to run the cef event loop after the timeout
|
||||
/// [`_cef_browser_process_handler_t::on_schedule_message_pump_work`] for more documentation.
|
||||
fn schedule_cef_message_loop_work(&self, scheduled_time: Instant);
|
||||
}
|
||||
|
||||
#[derive(Clone)]
|
||||
#[derive(Clone, Copy)]
|
||||
pub(crate) struct WindowSize {
|
||||
pub(crate) width: usize,
|
||||
pub(crate) height: usize,
|
||||
@@ -28,3 +32,50 @@ impl WindowSize {
|
||||
Self { width, height }
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Clone)]
|
||||
pub(crate) struct CefHandler {
|
||||
window_size_receiver: Arc<Mutex<WindowSizeReceiver>>,
|
||||
event_loop_proxy: EventLoopProxy<CustomEvent>,
|
||||
}
|
||||
struct WindowSizeReceiver {
|
||||
receiver: Receiver<WindowSize>,
|
||||
window_size: WindowSize,
|
||||
}
|
||||
impl WindowSizeReceiver {
|
||||
fn new(window_size_receiver: Receiver<WindowSize>) -> Self {
|
||||
Self {
|
||||
window_size: WindowSize { width: 1, height: 1 },
|
||||
receiver: window_size_receiver,
|
||||
}
|
||||
}
|
||||
}
|
||||
impl CefHandler {
|
||||
pub(crate) fn new(window_size_receiver: Receiver<WindowSize>, event_loop_proxy: EventLoopProxy<CustomEvent>) -> Self {
|
||||
Self {
|
||||
window_size_receiver: Arc::new(Mutex::new(WindowSizeReceiver::new(window_size_receiver))),
|
||||
event_loop_proxy,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl CefEventHandler for CefHandler {
|
||||
fn window_size(&self) -> WindowSize {
|
||||
let Ok(mut guard) = self.window_size_receiver.lock() else {
|
||||
tracing::error!("Failed to lock window_size_receiver");
|
||||
return WindowSize::new(1, 1);
|
||||
};
|
||||
let WindowSizeReceiver { receiver, window_size } = &mut *guard;
|
||||
for new_window_size in receiver.try_iter() {
|
||||
*window_size = new_window_size;
|
||||
}
|
||||
*window_size
|
||||
}
|
||||
fn draw(&self, frame_buffer: FrameBuffer) {
|
||||
let _ = self.event_loop_proxy.send_event(CustomEvent::UiUpdate(frame_buffer));
|
||||
}
|
||||
|
||||
fn schedule_cef_message_loop_work(&self, scheduled_time: std::time::Instant) {
|
||||
let _ = self.event_loop_proxy.send_event(CustomEvent::ScheduleBrowserWork(scheduled_time));
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user