From dcd959fc72513913c8c7ee06087522db8774e38c Mon Sep 17 00:00:00 2001 From: Hiroyuki Ikezoe Date: Thu, 21 Sep 2017 15:37:50 +0900 Subject: [PATCH] Use Atom::from(nsIAtom) to increment reference count in case of dynamic atom for will-change. If we don't increment the reference count for the Atom in servo side, it's possible to try to release the Atom in servo side even if we have already released in gecko side. When it happens, nsIAtom::mKind is no longer reliable. --- components/style/properties/gecko.mako.rs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/components/style/properties/gecko.mako.rs b/components/style/properties/gecko.mako.rs index a05a4f7ed7e..1606a2dc0df 100644 --- a/components/style/properties/gecko.mako.rs +++ b/components/style/properties/gecko.mako.rs @@ -3482,7 +3482,6 @@ fn static_assert() { pub fn clone_will_change(&self) -> longhands::will_change::computed_value::T { use properties::longhands::will_change::computed_value::T; use gecko_bindings::structs::nsIAtom; - use gecko_string_cache::Atom; use values::CustomIdent; if self.gecko.mWillChange.mBuffer.len() == 0 { @@ -3490,9 +3489,7 @@ fn static_assert() { } else { T::AnimateableFeatures( self.gecko.mWillChange.mBuffer.iter().map(|gecko_atom| { - CustomIdent( - unsafe { Atom::from_addrefed(*gecko_atom as *mut nsIAtom) } - ) + CustomIdent((*gecko_atom as *mut nsIAtom).into()) }).collect() ) }