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

compositor: Remove IOCompositor::pipeline_to_webview_map (#38827)

Browse source 
This data structure is now unused after changes to the way that hit
testing works.

Testing: This is just removing dead code so no tests are necessary.

Signed-off-by: Martin Robinson <mrobinson@igalia.com>
This commit is contained in:
Martin Robinson 2025-08-21 08:16:41 -07:00 • committed by GitHub
parent 48c2152f61
commit d4757c9e9f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 3 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

6
components/compositing/compositor.rs
View file

@ -85,11 +85,6 @@ pub struct ServoRenderer {
/// The [`RefreshDriver`] which manages the rythym of painting. /// The [`RefreshDriver`] which manages the rythym of painting.
refresh_driver: RefreshDriver, refresh_driver: RefreshDriver,
/// This is a temporary map between [`PipelineId`]s and their associated [`WebViewId`]. Once
/// all renderer operations become per-`WebView` this map can be removed, but we still sometimes
/// need to work backwards to figure out what `WebView` is associated with a `Pipeline`.
pub(crate) pipeline_to_webview_map: HashMap<PipelineId, WebViewId>,
/// Tracks whether we are in the process of shutting down, or have shut down and should close /// Tracks whether we are in the process of shutting down, or have shut down and should close
/// the compositor. This is shared with the `Servo` instance. /// the compositor. This is shared with the `Servo` instance.
shutdown_state: Rc<Cell<ShutdownState>>, shutdown_state: Rc<Cell<ShutdownState>>,
@ -313,7 +308,6 @@ impl IOCompositor {
state.event_loop_waker, state.event_loop_waker,
), ),
shutdown_state: state.shutdown_state, shutdown_state: state.shutdown_state,
pipeline_to_webview_map: Default::default(),
compositor_receiver: state.receiver, compositor_receiver: state.receiver,
constellation_sender: state.constellation_chan, constellation_sender: state.constellation_chan,
time_profiler_chan: state.time_profiler_chan, time_profiler_chan: state.time_profiler_chan,

23
components/compositing/webview_renderer.rs
View file

@ -101,15 +101,6 @@ pub(crate) struct WebViewRenderer {
viewport_description: Option<ViewportDescription>, viewport_description: Option<ViewportDescription>,
} }
impl Drop for WebViewRenderer {
fn drop(&mut self) {
self.global
.borrow_mut()
.pipeline_to_webview_map
.retain(|_, webview_id| self.id != *webview_id);
}
}
impl WebViewRenderer { impl WebViewRenderer {
pub(crate) fn new( pub(crate) fn new(
global: Rc<RefCell<ServoRenderer>>, global: Rc<RefCell<ServoRenderer>>,
@ -154,13 +145,9 @@ impl WebViewRenderer {
&mut self, &mut self,
pipeline_id: PipelineId, pipeline_id: PipelineId,
) -> &mut PipelineDetails { ) -> &mut PipelineDetails {
self.pipelines.entry(pipeline_id).or_insert_with(|| { self.pipelines
self.global .entry(pipeline_id)
.borrow_mut() .or_insert_with(PipelineDetails::new)
.pipeline_to_webview_map
.insert(pipeline_id, self.id);
PipelineDetails::new()
})
} }
pub(crate) fn pipeline_exited(&mut self, pipeline_id: PipelineId, source: PipelineExitSource) { pub(crate) fn pipeline_exited(&mut self, pipeline_id: PipelineId, source: PipelineExitSource) {
@ -179,10 +166,6 @@ impl WebViewRenderer {
} }
pipeline.remove_entry(); pipeline.remove_entry();
self.global
.borrow_mut()
.pipeline_to_webview_map
.remove(&pipeline_id);
} }
pub(crate) fn set_frame_tree(&mut self, frame_tree: &SendableFrameTree) { pub(crate) fn set_frame_tree(&mut self, frame_tree: &SendableFrameTree) {