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

Make StyleBuilder more efficient using stylearc.

Browse source 
MozReview-Commit-ID: 8wSsYPEmYE4
This commit is contained in:
Bobby Holley 2017-05-02 11:08:31 -07:00
parent 7b0679848b
commit 7dba36ed73
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
components/style/properties/properties.mako.rs
View file

@ -2056,7 +2056,7 @@ pub enum StyleStructRef<'a, T: 'a> {
/// A borrowed struct from the parent, for example, for inheriting style. /// A borrowed struct from the parent, for example, for inheriting style.
Borrowed(&'a Arc<T>), Borrowed(&'a Arc<T>),
/// An owned struct, that we've already mutated. /// An owned struct, that we've already mutated.
Owned(T), Owned(Arc<T>),
} }
impl<'a, T: 'a> StyleStructRef<'a, T> impl<'a, T: 'a> StyleStructRef<'a, T>
@ -2066,11 +2066,11 @@ impl<'a, T: 'a> StyleStructRef<'a, T>
/// borrowed value, or returning the owned one. /// borrowed value, or returning the owned one.
pub fn mutate(&mut self) -> &mut T { pub fn mutate(&mut self) -> &mut T {
if let StyleStructRef::Borrowed(v) = *self { if let StyleStructRef::Borrowed(v) = *self {
*self = StyleStructRef::Owned((**v).clone()); *self = StyleStructRef::Owned(Arc::new((**v).clone()));
} }
match *self { match *self {
StyleStructRef::Owned(ref mut v) => v, StyleStructRef::Owned(ref mut v) => Arc::get_mut(v).unwrap(),
StyleStructRef::Borrowed(..) => unreachable!(), StyleStructRef::Borrowed(..) => unreachable!(),
} }
} }
@ -2079,7 +2079,7 @@ impl<'a, T: 'a> StyleStructRef<'a, T>
/// hasn't been mutated. /// hasn't been mutated.
pub fn get_if_mutated(&mut self) -> Option<<&mut T> { pub fn get_if_mutated(&mut self) -> Option<<&mut T> {
match *self { match *self {
StyleStructRef::Owned(ref mut v) => Some(v), StyleStructRef::Owned(ref mut v) => Some(Arc::get_mut(v).unwrap()),
StyleStructRef::Borrowed(..) => None, StyleStructRef::Borrowed(..) => None,
} }
} }
@ -2088,7 +2088,7 @@ impl<'a, T: 'a> StyleStructRef<'a, T>
/// appropriate. /// appropriate.
pub fn build(self) -> Arc<T> { pub fn build(self) -> Arc<T> {
match self { match self {
StyleStructRef::Owned(v) => Arc::new(v), StyleStructRef::Owned(v) => v,
StyleStructRef::Borrowed(v) => v.clone(), StyleStructRef::Borrowed(v) => v.clone(),
} }
} }
@ -2099,7 +2099,7 @@ impl<'a, T: 'a> Deref for StyleStructRef<'a, T> {
fn deref(&self) -> &T { fn deref(&self) -> &T {
match *self { match *self {
StyleStructRef::Owned(ref v) => v, StyleStructRef::Owned(ref v) => &**v,
StyleStructRef::Borrowed(v) => &**v, StyleStructRef::Borrowed(v) => &**v,
} }
} }