mirror of
https://github.com/servo/servo.git
synced 2025-06-06 16:45:39 +00:00
Apply delay when epoch is mismatch for touch events
Signed-off-by: batu_hoang <longvatrong111@gmail.com>
This commit is contained in:
parent
54d37638b4
commit
afa3f4bba2
2 changed files with 35 additions and 12 deletions
|
@ -814,13 +814,12 @@ impl IOCompositor {
|
||||||
let Some(webview_renderer) = self.webview_renderers.get_mut(webview_id) else {
|
let Some(webview_renderer) = self.webview_renderers.get_mut(webview_id) else {
|
||||||
return warn!("Could not find WebView for incoming display list");
|
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.epoch_not_synchronized.set(true);
|
||||||
|
|
||||||
let pipeline_id = display_list_info.pipeline_id;
|
let pipeline_id = display_list_info.pipeline_id;
|
||||||
let details = webview_renderer.ensure_pipeline_details(pipeline_id.into());
|
let details = webview_renderer.ensure_pipeline_details(pipeline_id.into());
|
||||||
|
|
||||||
details.most_recent_display_list_epoch = Some(display_list_info.epoch);
|
details.most_recent_display_list_epoch = Some(display_list_info.epoch);
|
||||||
|
|
||||||
details.hit_test_items = display_list_info.hit_test_info;
|
details.hit_test_items = display_list_info.hit_test_info;
|
||||||
details.install_new_scroll_tree(display_list_info.scroll_tree);
|
details.install_new_scroll_tree(display_list_info.scroll_tree);
|
||||||
|
|
||||||
|
@ -1664,7 +1663,7 @@ impl IOCompositor {
|
||||||
if found_recomposite_msg {
|
if found_recomposite_msg {
|
||||||
// Process all pending events
|
// Process all pending events
|
||||||
self.webview_renderers.iter().for_each(|webview| {
|
self.webview_renderers.iter().for_each(|webview| {
|
||||||
webview.dispatch_pending_input_events();
|
webview.dispatch_pending_point_input_events();
|
||||||
webview.epoch_not_synchronized.set(false);
|
webview.epoch_not_synchronized.set(false);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
@ -99,7 +99,7 @@ pub(crate) struct WebViewRenderer {
|
||||||
/// active animations or animation frame callbacks.
|
/// active animations or animation frame callbacks.
|
||||||
animating: bool,
|
animating: bool,
|
||||||
/// Pending input events queue. Priavte and only this thread pushes events to it.
|
/// Pending input events queue. Priavte and only this thread pushes events to it.
|
||||||
pending_input_events: RefCell<VecDeque<InputEvent>>,
|
pending_point_input_events: RefCell<VecDeque<InputEvent>>,
|
||||||
/// Flag to indicate that the epoch has been not synchronized yet.
|
/// Flag to indicate that the epoch has been not synchronized yet.
|
||||||
pub epoch_not_synchronized: Cell<bool>,
|
pub epoch_not_synchronized: Cell<bool>,
|
||||||
}
|
}
|
||||||
|
@ -136,7 +136,7 @@ impl WebViewRenderer {
|
||||||
max_viewport_zoom: None,
|
max_viewport_zoom: None,
|
||||||
hidpi_scale_factor: Scale::new(hidpi_scale_factor.0),
|
hidpi_scale_factor: Scale::new(hidpi_scale_factor.0),
|
||||||
animating: false,
|
animating: false,
|
||||||
pending_input_events: Default::default(),
|
pending_point_input_events: Default::default(),
|
||||||
epoch_not_synchronized: Cell::default(),
|
epoch_not_synchronized: Cell::default(),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -323,7 +323,9 @@ impl WebViewRenderer {
|
||||||
};
|
};
|
||||||
|
|
||||||
if self.epoch_not_synchronized.get() {
|
if self.epoch_not_synchronized.get() {
|
||||||
self.pending_input_events.borrow_mut().push_back(event);
|
self.pending_point_input_events
|
||||||
|
.borrow_mut()
|
||||||
|
.push_back(event);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -336,7 +338,9 @@ impl WebViewRenderer {
|
||||||
{
|
{
|
||||||
Ok(hit_test_results) => hit_test_results,
|
Ok(hit_test_results) => hit_test_results,
|
||||||
Err(HitTestError::EpochMismatch) => {
|
Err(HitTestError::EpochMismatch) => {
|
||||||
self.pending_input_events.borrow_mut().push_back(event);
|
self.pending_point_input_events
|
||||||
|
.borrow_mut()
|
||||||
|
.push_back(event);
|
||||||
return;
|
return;
|
||||||
},
|
},
|
||||||
_ => {
|
_ => {
|
||||||
|
@ -353,8 +357,8 @@ impl WebViewRenderer {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub(crate) fn dispatch_pending_input_events(&self) {
|
pub(crate) fn dispatch_pending_point_input_events(&self) {
|
||||||
while let Some(event) = self.pending_input_events.borrow_mut().pop_front() {
|
while let Some(event) = self.pending_point_input_events.borrow_mut().pop_front() {
|
||||||
// Events that do not need to do hit testing are sent directly to the
|
// Events that do not need to do hit testing are sent directly to the
|
||||||
// constellation to filter down.
|
// constellation to filter down.
|
||||||
let Some(point) = event.point() else {
|
let Some(point) = event.point() else {
|
||||||
|
@ -453,13 +457,33 @@ impl WebViewRenderer {
|
||||||
}
|
}
|
||||||
|
|
||||||
fn send_touch_event(&self, mut event: TouchEvent) -> bool {
|
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.
|
||||||
|
self.pending_point_input_events
|
||||||
|
.borrow_mut()
|
||||||
|
.push_back(InputEvent::Touch(event));
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
let get_pipeline_details = |pipeline_id| self.pipelines.get(&pipeline_id);
|
let get_pipeline_details = |pipeline_id| self.pipelines.get(&pipeline_id);
|
||||||
let Ok(result) = self
|
let result = match self
|
||||||
.global
|
.global
|
||||||
.borrow()
|
.borrow()
|
||||||
.hit_test_at_point(event.point, get_pipeline_details)
|
.hit_test_at_point(event.point, get_pipeline_details)
|
||||||
else {
|
{
|
||||||
|
Ok(hit_test_results) => hit_test_results,
|
||||||
|
Err(HitTestError::EpochMismatch) => {
|
||||||
|
// If the epoch is not synchronized, we cannot send the event.
|
||||||
|
// We will try again later.
|
||||||
|
self.pending_point_input_events
|
||||||
|
.borrow_mut()
|
||||||
|
.push_back(InputEvent::Touch(event));
|
||||||
return false;
|
return false;
|
||||||
|
},
|
||||||
|
_ => {
|
||||||
|
return false;
|
||||||
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
event.init_sequence_id(self.touch_handler.current_sequence_id);
|
event.init_sequence_id(self.touch_handler.current_sequence_id);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue