core: return a Ref to avoid a copy in TDisplayObject::filters

Author: moulins

core/src/avm1/globals/button.rs

@@ -89,8 +89,8 @@ fn filters<'gc>(
     Ok(ArrayBuilder::new(activation)
         .with(
             this.filters()
-                .into_iter()
-                .map(|filter| bitmap_filter::filter_to_avm1(activation, filter)),
+                .iter()
+                .map(|filter| bitmap_filter::filter_to_avm1(activation, filter.clone())),
         )
         .into())
 }
@@ -109,7 +109,7 @@ fn set_filters<'gc>(
             }
         }
     }
-    this.set_filters(filters);
+    this.set_filters(filters.into_boxed_slice());
     Ok(())
 }
 

core/src/avm1/globals/movie_clip.rs

@@ -1765,8 +1765,8 @@ fn filters<'gc>(
     Ok(ArrayBuilder::new(activation)
         .with(
             this.filters()
-                .into_iter()
-                .map(|filter| bitmap_filter::filter_to_avm1(activation, filter)),
+                .iter()
+                .map(|filter| bitmap_filter::filter_to_avm1(activation, filter.clone())),
         )
         .into())
 }
@@ -1785,7 +1785,7 @@ fn set_filters<'gc>(
             }
         }
     }
-    this.set_filters(filters);
+    this.set_filters(filters.into_boxed_slice());
     Ok(())
 }
 

core/src/avm1/globals/text_field.rs

@@ -821,8 +821,8 @@ fn filters<'gc>(
     Ok(ArrayBuilder::new(activation)
         .with(
             this.filters()
-                .into_iter()
-                .map(|filter| bitmap_filter::filter_to_avm1(activation, filter)),
+                .iter()
+                .map(|filter| bitmap_filter::filter_to_avm1(activation, filter.clone())),
         )
         .into())
 }
@@ -841,7 +841,7 @@ fn set_filters<'gc>(
             }
         }
     }
-    this.set_filters(filters);
+    this.set_filters(filters.into_boxed_slice());
     Ok(())
 }
 

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

@@ -293,7 +293,7 @@ pub fn get_filters<'gc>(
     if let Some(dobj) = this.as_display_object() {
         let array = dobj
             .filters()
-            .into_iter()
+            .iter()
             .map(|f| f.as_avm2_object(activation))
             .collect::<Result<ArrayStorage<'gc>, Error<'gc>>>()?;
         return Ok(ArrayObject::from_storage(activation, array).into());
@@ -338,10 +338,10 @@ pub fn set_filters<'gc>(
                     filter_vec.push(Filter::from_avm2_object(activation, filter_object)?);
                 }
 
-                dobj.set_filters(filter_vec);
+                dobj.set_filters(filter_vec.into_boxed_slice());
             }
         } else {
-            dobj.set_filters(vec![]);
+            dobj.set_filters(Default::default());
         }
     }
 

core/src/debug_ui/display_object.rs

@@ -1249,7 +1249,7 @@ impl DisplayObjectWindow {
             CollapsingHeader::new(format!("Filters ({})", filters.len()))
                 .id_salt(ui.id().with("filters"))
                 .show(ui, |ui| {
-                    for filter in filters {
+                    for filter in &*filters {
                         ui.label(format!("{filter:?}"));
                     }
                 });

core/src/display_object.rs

@@ -255,7 +255,7 @@ pub struct DisplayObjectBase<'gc> {
 
 #[derive(Clone)]
 struct DisplayObjectBaseMut {
-    filters: Vec<Filter>,
+    filters: Box<[Filter]>,
 
     blend_shader: Option<PixelBenderShaderHandle>,
 
@@ -550,11 +550,11 @@ impl<'gc> DisplayObjectBase<'gc> {
         unlock!(this, Self, name).set(Some(name));
     }
 
-    fn filters(&self) -> Vec<Filter> {
-        self.cell.borrow().filters.clone()
+    fn filters(&self) -> Ref<'_, [Filter]> {
+        Ref::map(self.cell.borrow(), |c| &*c.filters)
     }
 
-    fn set_filters(&self, filters: Vec<Filter>) -> bool {
+    fn set_filters(&self, filters: Box<[Filter]>) -> bool {
         let mut write = self.cell.borrow_mut();
         let changed = filters != write.filters;
         write.filters = filters;
@@ -849,7 +849,7 @@ pub fn render_base<'gc>(this: DisplayObject<'gc>, context: &mut RenderContext<'_
             &context.stage.view_matrix(),
         );
         let name = this.name();
-        let mut filters: Vec<Filter> = this.filters();
+        let mut filters: Vec<Filter> = this.filters().to_owned();
         let swf_version = this.swf_version();
         filters.retain(|f| !f.impotent());
 
@@ -1237,8 +1237,7 @@ pub trait TDisplayObject<'gc>:
         }
 
         if include_own_filters {
-            let filters = self.filters();
-            for mut filter in filters {
+            for mut filter in self.filters().iter().cloned() {
                 filter.scale(view_matrix.a, view_matrix.d);
                 bounds = filter.calculate_dest_rect(bounds);
             }
@@ -1582,11 +1581,11 @@ pub trait TDisplayObject<'gc>:
         DisplayObjectBase::set_name(Gc::write(mc, self.base()), name)
     }
 
-    fn filters(self) -> Vec<Filter> {
-        self.base().filters()
+    fn filters(self) -> Ref<'gc, [Filter]> {
+        Gc::as_ref(self.base()).filters()
     }
 
-    fn set_filters(self, filters: Vec<Filter>) {
+    fn set_filters(self, filters: Box<[Filter]>) {
         if self.base().set_filters(filters) {
             self.invalidate_cached_bitmap();
         }

core/src/display_object/avm2_button.rs

@@ -615,8 +615,7 @@ impl<'gc> TDisplayObject<'gc> for Avm2Button<'gc> {
         }
 
         if include_own_filters {
-            let filters = self.filters();
-            for mut filter in filters {
+            for mut filter in self.filters().iter().cloned() {
                 filter.scale(view_matrix.a, view_matrix.d);
                 bounds = filter.calculate_dest_rect(bounds);
             }