Skip to content

Commit 4d6d99a

Browse files
committed
core: Remove GcCell in MovieClip
Use field-wise interior mutability instead.
1 parent 7c9dd80 commit 4d6d99a

File tree

4 files changed

+292
-328
lines changed

4 files changed

+292
-328
lines changed

core/src/avm1/activation.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -729,7 +729,7 @@ impl<'a, 'gc> Activation<'a, 'gc> {
729729

730730
if let Some((clip, frame)) = call_frame {
731731
if frame <= u16::MAX as u32 {
732-
for action in clip.actions_on_frame(self.context, frame as u16) {
732+
for action in clip.actions_on_frame(frame as u16) {
733733
let _ = self.run_child_frame_for_action("[Frame Call]", clip.into(), action)?;
734734
}
735735
}

core/src/avm1/globals/movie_clip.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -987,7 +987,7 @@ pub fn clone_sprite<'gc>(
987987
new_clip.set_matrix(context.gc(), *movie_clip.base().matrix());
988988
new_clip.set_color_transform(context.gc(), *movie_clip.base().color_transform());
989989

990-
new_clip.set_clip_event_handlers(context.gc(), movie_clip.clip_actions().to_vec());
990+
new_clip.set_clip_event_handlers((&*movie_clip.clip_actions()).into());
991991

992992
if let Some(drawing) = movie_clip.drawing().as_deref().cloned() {
993993
*new_clip.drawing_mut(context.gc()) = drawing;

core/src/avm2/globals/flash/display/sprite.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ pub fn set_hit_area<'gc>(
309309
let object = args
310310
.try_get_object(activation, 0)
311311
.and_then(|hit_area| hit_area.as_display_object());
312-
mc.set_hit_area(activation.context, object);
312+
mc.set_hit_area(activation.gc(), object);
313313
}
314314

315315
Ok(Value::Undefined)

0 commit comments

Comments
 (0)