Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 05:30:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

compositor: Remove the script channel from the compositor (#36089)

Browse source 
This is a clean up after #36062 and #35985. It removes the script
channel for each pipeline from the compositor. Now all messages are sent
via the `Constellation` first, which will allow breaking the dependency
on script in the compositor.

In addition, scroll states are actually sent via the `Constellation`,
which was an oversight from #36062. Finally, a typo in a method name is
fixed.

Signed-off-by: Martin Robinson <mrobinson@igalia.com>
This commit is contained in:
Martin Robinson 2025-03-23 12:19:27 +01:00 • committed by GitHub
parent 5ed2eb62ec
commit 3c51df0f1b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 12 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

14
components/compositing/webview.rs
View file

@ -17,7 +17,7 @@ use embedder_traits::{
use euclid::{Point2D, Scale, Vector2D}; use euclid::{Point2D, Scale, Vector2D};
use fnv::FnvHashSet; use fnv::FnvHashSet;
use log::{debug, warn}; use log::{debug, warn};
use script_traits::{AnimationState, ScriptThreadMessage, TouchEventResult}; use script_traits::{AnimationState, TouchEventResult};
use webrender::Transaction; use webrender::Transaction;
use webrender_api::units::{DeviceIntPoint, DevicePoint, DeviceRect, LayoutVector2D}; use webrender_api::units::{DeviceIntPoint, DevicePoint, DeviceRect, LayoutVector2D};
use webrender_api::{ use webrender_api::{
@ -158,10 +158,14 @@ impl WebView {
} }
}); });
if let Some(pipeline) = details.pipeline.as_ref() { let _ = self
let message = ScriptThreadMessage::SetScrollStates(pipeline_id, scroll_states); .global
let _ = pipeline.script_chan.send(message); .borrow()
} .constellation_sender
.send(ConstellationMsg::SetScrollStates(
pipeline_id,
scroll_states,
));
} }
pub(crate) fn set_frame_tree_on_pipeline_details( pub(crate) fn set_frame_tree_on_pipeline_details(

5
components/constellation/event_loop.rs
View file

@ -38,9 +38,4 @@ impl EventLoop {
pub fn send(&self, msg: ScriptThreadMessage) -> Result<(), Error> { pub fn send(&self, msg: ScriptThreadMessage) -> Result<(), Error> {
self.script_chan.send(msg) self.script_chan.send(msg)
} }
/// The underlying channel to the script thread.
pub fn sender(&self) -> IpcSender<ScriptThreadMessage> {
self.script_chan.clone()
}
} }

1
components/constellation/pipeline.rs
View file

@ -422,7 +422,6 @@ impl Pipeline {
CompositionPipeline { CompositionPipeline {
id: self.id, id: self.id,
webview_id: self.webview_id, webview_id: self.webview_id,
script_chan: self.event_loop.sender(),
} }
} }

8
components/script/script_thread.rs
View file

@ -1878,16 +1878,12 @@ impl ScriptThread {
panic!("should have handled {:?} already", msg) panic!("should have handled {:?} already", msg)
}, },
ScriptThreadMessage::SetScrollStates(pipeline_id, scroll_states) => { ScriptThreadMessage::SetScrollStates(pipeline_id, scroll_states) => {
self.handle_set_scroll_states_offsets(pipeline_id, scroll_states) self.handle_set_scroll_states(pipeline_id, scroll_states)
}, },
} }
} }
fn handle_set_scroll_states_offsets( fn handle_set_scroll_states(&self, pipeline_id: PipelineId, scroll_states: Vec<ScrollState>) {
&self,
pipeline_id: PipelineId,
scroll_states: Vec<ScrollState>,
) {
let Some(window) = self.documents.borrow().find_window(pipeline_id) else { let Some(window) = self.documents.borrow().find_window(pipeline_id) else {
warn!("Received scroll states for closed pipeline {pipeline_id}"); warn!("Received scroll states for closed pipeline {pipeline_id}");
return; return;

3
components/shared/compositing/lib.rs
View file

@ -13,7 +13,7 @@ use euclid::Rect;
use ipc_channel::ipc::IpcSender; use ipc_channel::ipc::IpcSender;
use log::warn; use log::warn;
use pixels::Image; use pixels::Image;
use script_traits::{AnimationState, ScriptThreadMessage, TouchEventResult}; use script_traits::{AnimationState, TouchEventResult};
use strum_macros::IntoStaticStr; use strum_macros::IntoStaticStr;
use style_traits::CSSPixel; use style_traits::CSSPixel;
use webrender_api::DocumentId; use webrender_api::DocumentId;
@ -102,7 +102,6 @@ pub struct SendableFrameTree {
pub struct CompositionPipeline { pub struct CompositionPipeline {
pub id: PipelineId, pub id: PipelineId,
pub webview_id: WebViewId, pub webview_id: WebViewId,
pub script_chan: IpcSender<ScriptThreadMessage>,
} }
impl Debug for CompositorMsg { impl Debug for CompositorMsg {