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

style: Add ToShmem impl for shared_lock::Locked.

Browse source 
Depends on D17192

Differential Revision: https://phabricator.services.mozilla.com/D17193
This commit is contained in:
Cameron McCormack 2019-03-30 00:16:17 +00:00 • committed by Emilio Cobos Álvarez
parent 8c007ad999
commit b8506e4a55
1 changed files with 23 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

23
components/style/shared_lock.rs
View file

@ -16,7 +16,10 @@ use std::fmt;
#[cfg(feature = "servo")] #[cfg(feature = "servo")]
use std::mem; use std::mem;
#[cfg(feature = "gecko")] #[cfg(feature = "gecko")]
use std::mem::ManuallyDrop;
#[cfg(feature = "gecko")]
use std::ptr; use std::ptr;
use to_shmem::{SharedMemoryBuilder, ToShmem};
/// A shared read/write lock that can protect multiple objects. /// A shared read/write lock that can protect multiple objects.
/// ///
@ -238,6 +241,26 @@ impl<T> Locked<T> {
} }
} }
#[cfg(feature = "gecko")]
impl<T: ToShmem> ToShmem for Locked<T> {
fn to_shmem(&self, builder: &mut SharedMemoryBuilder) -> ManuallyDrop<Self> {
let guard = self.shared_lock.read();
ManuallyDrop::new(Locked {
shared_lock: SharedRwLock::read_only(),
data: UnsafeCell::new(ManuallyDrop::into_inner(
self.read_with(&guard).to_shmem(builder),
)),
})
}
}
#[cfg(feature = "servo")]
impl<T: ToShmem> ToShmem for Locked<T> {
fn to_shmem(&self, _builder: &mut SharedMemoryBuilder) -> ManuallyDrop<Self> {
panic!("ToShmem not supported in Servo currently")
}
}
#[allow(dead_code)] #[allow(dead_code)]
mod compile_time_assert { mod compile_time_assert {
use super::{SharedRwLockReadGuard, SharedRwLockWriteGuard}; use super::{SharedRwLockReadGuard, SharedRwLockWriteGuard};