eliott/servo
1
0
Fork 0
mirror of https://github.com/servo/servo synced 2026-04-26 01:25:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

script: Merge ScrollEvent with SetScrollStates messages (#42834)

Browse Source 
Remove embedder defined `ScrollEvent` and merge the payload of it to the
`SetScrollStates` message which tell the `ScriptThread` to update the
scroll state.

In the past, `ScrollEvent` is defined as a embedder's `InputEvent` and
being used only to forward the external scroll node id for a node that
is considered scrolled. This make us sends an additional message to
constellation and additionally, `ScrollEvent` went through lengthy
pipelines as it was deemed as an embedder input event, albeit being a
synthetic input fired by `WebviewRenderer`.

Subsequently, we could introduce a flag to detect whether the scrolling
is still ongoing or not (like whether it is still flinging) for
`scrollend` event.

Testing: No WPT changes

---------

Signed-off-by: Jo Steven Novaryo <steven.novaryo@gmail.com>
Signed-off-by: Martin Robinson <mrobinson@igalia.com>
Co-authored-by: Martin Robinson <mrobinson@igalia.com>
This commit is contained in:
Steven Novaryo
2026-02-26 15:36:55 +08:00
committed by GitHub
parent 9f426e38ba
commit d70ab4e1c0
8 changed files with 53 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
components/script/script_thread.rs
View File

@@ -42,8 +42,8 @@ use canvas_traits::webgl::WebGLPipeline;
use chrono::{DateTime, Local};
use constellation_traits::{
JsEvalResult, LoadData, LoadOrigin, NavigationHistoryBehavior, ScreenshotReadinessResponse,
ScriptToConstellationChan, ScriptToConstellationMessage, StructuredSerializedData,
WindowSizeType,
ScriptToConstellationChan, ScriptToConstellationMessage, ScrollStateUpdate,
StructuredSerializedData, WindowSizeType,
};
use crossbeam_channel::unbounded;
use data_url::mime::Mime;
@@ -108,8 +108,6 @@ use timers::{TimerEventRequest, TimerId, TimerScheduler};
use url::Position;
#[cfg(feature = "webgpu")]
use webgpu_traits::{WebGPUDevice, WebGPUMsg};
use webrender_api::ExternalScrollId;
use webrender_api::units::LayoutVector2D;
use crate::devtools::DevtoolsState;
use crate::document_collection::DocumentCollection;
@@ -1975,11 +1973,7 @@ impl ScriptThread {
}
}
fn handle_set_scroll_states(
&self,
pipeline_id: PipelineId,
scroll_states: FxHashMap<ExternalScrollId, LayoutVector2D>,
) {
fn handle_set_scroll_states(&self, pipeline_id: PipelineId, scroll_states: ScrollStateUpdate) {
let Some(window) = self.documents.borrow().find_window(pipeline_id) else {
warn!("Received scroll states for closed pipeline {pipeline_id}");
return;
@@ -1991,9 +1985,14 @@ impl ScriptThread {
|| {
window
.layout_mut()
.set_scroll_offsets_from_renderer(&scroll_states);
.set_scroll_offsets_from_renderer(&scroll_states.offsets);
},
)
);
window
.Document()
.event_handler()
.handle_embedder_scroll_event(scroll_states.scrolled_node);
}
#[cfg(feature = "webgpu")]