diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2019-11-27 20:48:13 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-11-27 20:48:13 -0500 |
commit | 5f1681ad25921e7bb779a9223445167124e44e14 (patch) | |
tree | 6d0bf2158deae70042cc331898335fd9f27472f6 /components/script/dom/bindings/trace.rs | |
parent | fda3d44902160c1c6131498e72ef00febb6b8ca5 (diff) | |
parent | 564c16d75499ae45b3945f487e49587c6fd662c7 (diff) | |
download | servo-5f1681ad25921e7bb779a9223445167124e44e14.tar.gz servo-5f1681ad25921e7bb779a9223445167124e44e14.zip |
Auto merge of #24875 - jdm:wr-no-ipc, r=asajeffrey
Extract IPC out of webrender
Fixes #20172. Fixes #13480.
Diffstat (limited to 'components/script/dom/bindings/trace.rs')
-rw-r--r-- | components/script/dom/bindings/trace.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/components/script/dom/bindings/trace.rs b/components/script/dom/bindings/trace.rs index fbd4da02d5b..5f10ad44446 100644 --- a/components/script/dom/bindings/trace.rs +++ b/components/script/dom/bindings/trace.rs @@ -96,7 +96,7 @@ use script_layout_interface::OpaqueStyleAndLayoutData; use script_traits::transferable::MessagePortImpl; use script_traits::{DocumentActivity, DrawAPaintImageResult}; use script_traits::{MediaSessionActionType, ScriptToConstellationChan, TimerEventId, TimerSource}; -use script_traits::{UntrustedNodeAddress, WindowSizeData, WindowSizeType}; +use script_traits::{UntrustedNodeAddress, WebrenderIpcSender, WindowSizeData, WindowSizeType}; use selectors::matching::ElementSelectorFlags; use serde::{Deserialize, Serialize}; use servo_arc::Arc as ServoArc; @@ -146,7 +146,7 @@ use tendril::{StrTendril, TendrilSink}; use time::{Duration, Timespec}; use uuid::Uuid; use webgpu::{WebGPU, WebGPUAdapter}; -use webrender_api::{DocumentId, ImageKey, RenderApiSender}; +use webrender_api::{DocumentId, ImageKey}; use webvr_traits::{WebVRGamepadData, WebVRGamepadHand, WebVRGamepadState}; use webxr_api::SwapChainId as WebXRSwapChainId; @@ -527,7 +527,6 @@ unsafe_no_jsmanaged_fields!(Arc<Mutex<dyn Player>>); unsafe_no_jsmanaged_fields!(WebRtcController); unsafe_no_jsmanaged_fields!(MediaStreamId, MediaStreamType); unsafe_no_jsmanaged_fields!(Mutex<MediaFrameRenderer>); -unsafe_no_jsmanaged_fields!(RenderApiSender); unsafe_no_jsmanaged_fields!(ResourceFetchTiming); unsafe_no_jsmanaged_fields!(Timespec); unsafe_no_jsmanaged_fields!(HTMLMediaElementFetchContext); @@ -541,6 +540,7 @@ unsafe_no_jsmanaged_fields!(WebGLContextId); unsafe_no_jsmanaged_fields!(Arc<Mutex<dyn AudioRenderer>>); unsafe_no_jsmanaged_fields!(MediaSessionActionType); unsafe_no_jsmanaged_fields!(MediaMetadata); +unsafe_no_jsmanaged_fields!(WebrenderIpcSender); unsafe impl<'a> JSTraceable for &'a str { #[inline] |