diff options
Diffstat (limited to 'components/shared/script')
-rw-r--r-- | components/shared/script/lib.rs | 8 | ||||
-rw-r--r-- | components/shared/script/script_msg.rs | 10 |
2 files changed, 5 insertions, 13 deletions
diff --git a/components/shared/script/lib.rs b/components/shared/script/lib.rs index 1ab9e518731..c3bb72156b4 100644 --- a/components/shared/script/lib.rs +++ b/components/shared/script/lib.rs @@ -58,7 +58,9 @@ use style_traits::{CSSPixel, SpeculativePainter}; use webgpu::WebGPUMsg; use webrender_api::units::{DeviceIntSize, DevicePixel, LayoutPixel}; use webrender_api::{DocumentId, ExternalScrollId, ImageKey}; -use webrender_traits::{UntrustedNodeAddress as WebRenderUntrustedNodeAddress, WebRenderScriptApi}; +use webrender_traits::{ + CrossProcessCompositorApi, UntrustedNodeAddress as WebRenderUntrustedNodeAddress, +}; pub use crate::script_msg::{ DOMMessage, EventResult, HistoryEntryReplacement, IFrameSizeMsg, Job, JobError, JobResult, @@ -659,8 +661,8 @@ pub struct InitialScriptState { pub webxr_registry: webxr_api::Registry, /// The Webrender document ID associated with this thread. pub webrender_document: DocumentId, - /// FIXME(victor): The Webrender API sender in this constellation's pipeline - pub webrender_api_sender: WebRenderScriptApi, + /// Access to the compositor across a process boundary. + pub compositor_api: CrossProcessCompositorApi, /// Application window's GL Context for Media player pub player_context: WindowGLContext, } diff --git a/components/shared/script/script_msg.rs b/components/shared/script/script_msg.rs index ee8e8da1386..5689395ef32 100644 --- a/components/shared/script/script_msg.rs +++ b/components/shared/script/script_msg.rs @@ -24,7 +24,6 @@ use serde::{Deserialize, Serialize}; use servo_url::{ImmutableOrigin, ServoUrl}; use style_traits::CSSPixel; use webgpu::{wgc, WebGPU, WebGPUResponse}; -use webrender_api::units::{DeviceIntPoint, DeviceIntSize}; use crate::{ AnimationState, AuxiliaryBrowsingContextLoadInfo, BroadcastMsg, DocumentState, @@ -245,12 +244,6 @@ pub enum ScriptMsg { ForwardDOMMessage(DOMMessage, ServoUrl), /// <https://w3c.github.io/ServiceWorker/#schedule-job-algorithm> ScheduleJob(Job), - /// Get Window Informations size and position - GetClientWindow(IpcSender<(DeviceIntSize, DeviceIntPoint)>), - /// Get the screen size (pixel) - GetScreenSize(IpcSender<DeviceIntSize>), - /// Get the available screen size (pixel) - GetScreenAvailSize(IpcSender<DeviceIntSize>), /// Notifies the constellation about media session events /// (i.e. when there is metadata for the active media session, playback state changes...). MediaSessionEvent(PipelineId, MediaSessionEvent), @@ -318,9 +311,6 @@ impl fmt::Debug for ScriptMsg { PipelineExited => "PipelineExited", ForwardDOMMessage(..) => "ForwardDOMMessage", ScheduleJob(..) => "ScheduleJob", - GetClientWindow(..) => "GetClientWindow", - GetScreenSize(..) => "GetScreenSize", - GetScreenAvailSize(..) => "GetScreenAvailSize", MediaSessionEvent(..) => "MediaSessionEvent", RequestAdapter(..) => "RequestAdapter", GetWebGPUChan(..) => "GetWebGPUChan", |