Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add comment and rename epoch_not_synchronized

Browse source 
Signed-off-by: batu_hoang <longvatrong111@gmail.com>
This commit is contained in:
batu_hoang 2025-06-03 16:00:31 +08:00
parent afa3f4bba2
commit 3d7ced5048
2 changed files with 20 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

10
components/compositing/compositor.rs
View file

@ -671,7 +671,7 @@ impl IOCompositor {
};
let dppx = webview_renderer.device_pixels_per_page_pixel();
let point = dppx.transform_point(Point2D::new(x, y));
webview_renderer.dispatch_input_event(
webview_renderer.dispatch_point_input_event(
InputEvent::MouseButton(MouseButtonEvent::new(action, button, point))
.with_webdriver_message_id(Some(message_id)),
);
@ -684,7 +684,7 @@ impl IOCompositor {
};
let dppx = webview_renderer.device_pixels_per_page_pixel();
let point = dppx.transform_point(Point2D::new(x, y));
webview_renderer.dispatch_input_event(
webview_renderer.dispatch_point_input_event(
InputEvent::MouseMove(MouseMoveEvent::new(point))
.with_webdriver_message_id(Some(message_id)),
);
@ -706,7 +706,7 @@ impl IOCompositor {
let scroll_delta =
dppx.transform_vector(Vector2D::new(delta_x as f32, delta_y as f32));
webview_renderer
.dispatch_input_event(InputEvent::Wheel(WheelEvent { delta, point }));
.dispatch_point_input_event(InputEvent::Wheel(WheelEvent { delta, point }));
webview_renderer.on_webdriver_wheel_action(scroll_delta, point);
},
@ -815,7 +815,7 @@ impl IOCompositor {
return warn!("Could not find WebView for incoming display list");
};
// epoch is outdated until we receive "NewWebRenderFrameReady" message.
webview_renderer.epoch_not_synchronized.set(true);
webview_renderer.webrender_frame_ready.set(false);
let pipeline_id = display_list_info.pipeline_id;
let details = webview_renderer.ensure_pipeline_details(pipeline_id.into());
@ -1664,7 +1664,7 @@ impl IOCompositor {
// Process all pending events
self.webview_renderers.iter().for_each(|webview| {
webview.dispatch_pending_point_input_events();
webview.epoch_not_synchronized.set(false);
webview.webrender_frame_ready.set(true);
});
}

26
components/compositing/webview_renderer.rs
View file

@ -101,7 +101,7 @@ pub(crate) struct WebViewRenderer {
/// Pending input events queue. Priavte and only this thread pushes events to it.
pending_point_input_events: RefCell<VecDeque<InputEvent>>,
/// Flag to indicate that the epoch has been not synchronized yet.
pub epoch_not_synchronized: Cell<bool>,
pub webrender_frame_ready: Cell<bool>,
}
impl Drop for WebViewRenderer {
@ -137,7 +137,7 @@ impl WebViewRenderer {
hidpi_scale_factor: Scale::new(hidpi_scale_factor.0),
animating: false,
pending_point_input_events: Default::default(),
epoch_not_synchronized: Cell::default(),
webrender_frame_ready: Cell::default(),
}
}
@ -315,14 +315,17 @@ impl WebViewRenderer {
}
}
pub(crate) fn dispatch_input_event(&mut self, event: InputEvent) {
pub(crate) fn dispatch_point_input_event(&mut self, event: InputEvent) {
// Events that do not need to do hit testing are sent directly to the
// constellation to filter down.
let Some(point) = event.point() else {
return;
};
if self.epoch_not_synchronized.get() {
// Delay the event if the epoch is not synchronized yet (new frame is not ready),
// or hit test result would fail and the event is rejected anyway.
if !self.webrender_frame_ready.get() || !self.pending_point_input_events.borrow().is_empty()
{
self.pending_point_input_events
.borrow_mut()
.push_back(event);
@ -453,13 +456,14 @@ impl WebViewRenderer {
}
}
self.dispatch_input_event(event);
self.dispatch_point_input_event(event);
}
fn send_touch_event(&self, mut event: TouchEvent) -> bool {
if self.epoch_not_synchronized.get() {
// If the epoch is not synchronized, we cannot send the event.
// We will try again later.
// Delay the event if the epoch is not synchronized yet (new frame is not ready),
// or hit test result would fail and the event is rejected anyway.
if !self.webrender_frame_ready.get() || !self.pending_point_input_events.borrow().is_empty()
{
self.pending_point_input_events
.borrow_mut()
.push_back(InputEvent::Touch(event));
@ -759,13 +763,13 @@ impl WebViewRenderer {
/// <http://w3c.github.io/touch-events/#mouse-events>
fn simulate_mouse_click(&mut self, point: DevicePoint) {
let button = MouseButton::Left;
self.dispatch_input_event(InputEvent::MouseMove(MouseMoveEvent::new(point)));
self.dispatch_input_event(InputEvent::MouseButton(MouseButtonEvent::new(
self.dispatch_point_input_event(InputEvent::MouseMove(MouseMoveEvent::new(point)));
self.dispatch_point_input_event(InputEvent::MouseButton(MouseButtonEvent::new(
MouseButtonAction::Down,
button,
point,
)));
self.dispatch_input_event(InputEvent::MouseButton(MouseButtonEvent::new(
self.dispatch_point_input_event(InputEvent::MouseButton(MouseButtonEvent::new(
MouseButtonAction::Up,
button,
point,