core: Remove now-unused (gc_)context args in TDisplayObject

Author: moulins

core/src/avm1/globals/button.rs

@@ -70,12 +70,12 @@ fn blend_mode<'gc>(
 
 fn set_blend_mode<'gc>(
     this: Avm1Button<'gc>,
-    activation: &mut Activation<'_, 'gc>,
+    _activation: &mut Activation<'_, 'gc>,
     value: Value<'gc>,
 ) -> Result<(), Error<'gc>> {
     // No-op if value is not a valid blend mode.
     if let Some(mode) = value.as_blend_mode() {
-        this.set_blend_mode(activation.gc(), mode.into());
+        this.set_blend_mode(mode.into());
     } else {
         tracing::error!("Unknown blend mode {value:?}");
     }
@@ -109,7 +109,7 @@ fn set_filters<'gc>(
             }
         }
     }
-    this.set_filters(activation.gc(), filters);
+    this.set_filters(filters);
     Ok(())
 }
 
@@ -127,7 +127,7 @@ fn set_cache_as_bitmap<'gc>(
     value: Value<'gc>,
 ) -> Result<(), Error<'gc>> {
     // Note that the *getter* returns actual, and *setter* is preference
-    this.set_bitmap_cached_preference(activation.gc(), value.as_bool(activation.swf_version()));
+    this.set_bitmap_cached_preference(value.as_bool(activation.swf_version()));
     Ok(())
 }
 

core/src/avm1/globals/color.rs

@@ -133,7 +133,7 @@ fn set_rgb<'gc>(
     if let Some(target) = target(activation, this)? {
         target.set_transformed_by_script(true);
         if let Some(parent) = target.parent() {
-            parent.invalidate_cached_bitmap(activation.gc());
+            parent.invalidate_cached_bitmap();
         }
 
         let rgb = args
@@ -196,7 +196,7 @@ fn set_transform<'gc>(
     if let Some(target) = target(activation, this)? {
         target.set_transformed_by_script(true);
         if let Some(parent) = target.parent() {
-            parent.invalidate_cached_bitmap(activation.gc());
+            parent.invalidate_cached_bitmap();
         }
 
         let base = target.base();

core/src/avm1/globals/movie_clip.rs

@@ -177,7 +177,7 @@ fn set_scroll_rect<'gc>(
     if let Value::Object(object) = value {
         this.set_has_scroll_rect(true);
         if let Some(rectangle) = object_to_rectangle(activation, object)? {
-            this.set_next_scroll_rect(activation.gc(), rectangle);
+            this.set_next_scroll_rect(rectangle);
         }
     } else {
         this.set_has_scroll_rect(false);
@@ -391,11 +391,9 @@ fn line_style<'gc>(
             .with_allow_scale_y(allow_scale_y)
             .with_is_pixel_hinted(is_pixel_hinted)
             .with_allow_close(false);
-        movie_clip
-            .drawing_mut(activation.gc())
-            .set_line_style(Some(line_style));
+        movie_clip.drawing_mut().set_line_style(Some(line_style));
     } else {
-        movie_clip.drawing_mut(activation.gc()).set_line_style(None);
+        movie_clip.drawing_mut().set_line_style(None);
     }
     Ok(Value::Undefined)
 }
@@ -475,9 +473,7 @@ fn line_gradient_style<'gc>(
                 focal_point: Fixed8::from_f64(focal_point),
             },
         };
-        movie_clip
-            .drawing_mut(activation.gc())
-            .set_line_fill_style(style);
+        movie_clip.drawing_mut().set_line_fill_style(style);
     }
     Ok(Value::Undefined)
 }
@@ -569,10 +565,10 @@ fn begin_fill<'gc>(
             / 100.0
             * 255.0;
         movie_clip
-            .drawing_mut(activation.gc())
+            .drawing_mut()
             .set_fill_style(Some(FillStyle::Color(Color::from_rgb(rgb, alpha as u8))));
     } else {
-        movie_clip.drawing_mut(activation.gc()).set_fill_style(None);
+        movie_clip.drawing_mut().set_fill_style(None);
     }
     Ok(Value::Undefined)
 }
@@ -591,7 +587,7 @@ fn begin_bitmap_fill<'gc>(
                 width: bitmap_data.width() as u16,
                 height: bitmap_data.height() as u16,
             };
-            let id = movie_clip.drawing_mut(activation.gc()).add_bitmap(bitmap);
+            let id = movie_clip.drawing_mut().add_bitmap(bitmap);
 
             let mut matrix = avm1::globals::matrix::object_to_matrix_or_default(
                 args.get(1)
@@ -624,9 +620,7 @@ fn begin_bitmap_fill<'gc>(
     } else {
         None
     };
-    movie_clip
-        .drawing_mut(activation.gc())
-        .set_fill_style(fill_style);
+    movie_clip.drawing_mut().set_fill_style(fill_style);
     Ok(Value::Undefined)
 }
 
@@ -637,7 +631,7 @@ fn begin_gradient_fill<'gc>(
 ) -> Result<Value<'gc>, Error<'gc>> {
     if Value::Undefined == *args.get(0).unwrap_or(&Value::Undefined) {
         // The path has no fill if the first parameter is `undefined`, or if no parameters are passed.
-        movie_clip.drawing_mut(activation.gc()).set_fill_style(None);
+        movie_clip.drawing_mut().set_fill_style(None);
     } else if let (Some(gradient_type), Some(colors), Some(alphas), Some(ratios), Some(matrix)) = (
         args.get(0),
         args.get(1),
@@ -700,9 +694,7 @@ fn begin_gradient_fill<'gc>(
                 focal_point: Fixed8::from_f64(focal_point),
             },
         };
-        movie_clip
-            .drawing_mut(activation.gc())
-            .set_fill_style(Some(style));
+        movie_clip.drawing_mut().set_fill_style(Some(style));
     }
     Ok(Value::Undefined)
 }
@@ -716,7 +708,7 @@ fn move_to<'gc>(
         let x = x.coerce_to_f64(activation)?;
         let y = y.coerce_to_f64(activation)?;
         movie_clip
-            .drawing_mut(activation.gc())
+            .drawing_mut()
             .draw_command(DrawCommand::MoveTo(Point::from_pixels(x, y)));
     }
     Ok(Value::Undefined)
@@ -731,7 +723,7 @@ fn line_to<'gc>(
         let x = x.coerce_to_f64(activation)?;
         let y = y.coerce_to_f64(activation)?;
         movie_clip
-            .drawing_mut(activation.gc())
+            .drawing_mut()
             .draw_command(DrawCommand::LineTo(Point::from_pixels(x, y)));
     }
     Ok(Value::Undefined)
@@ -748,7 +740,7 @@ fn curve_to<'gc>(
         let anchor_x = anchor_x.coerce_to_f64(activation)?;
         let anchor_y = anchor_y.coerce_to_f64(activation)?;
         movie_clip
-            .drawing_mut(activation.gc())
+            .drawing_mut()
             .draw_command(DrawCommand::QuadraticCurveTo {
                 control: Point::from_pixels(control_x, control_y),
                 anchor: Point::from_pixels(anchor_x, anchor_y),
@@ -759,19 +751,19 @@ fn curve_to<'gc>(
 
 fn end_fill<'gc>(
     movie_clip: MovieClip<'gc>,
-    activation: &mut Activation<'_, 'gc>,
+    _activation: &mut Activation<'_, 'gc>,
     _args: &[Value<'gc>],
 ) -> Result<Value<'gc>, Error<'gc>> {
-    movie_clip.drawing_mut(activation.gc()).set_fill_style(None);
+    movie_clip.drawing_mut().set_fill_style(None);
     Ok(Value::Undefined)
 }
 
 fn clear<'gc>(
     movie_clip: MovieClip<'gc>,
-    activation: &mut Activation<'_, 'gc>,
+    _activation: &mut Activation<'_, 'gc>,
     _args: &[Value<'gc>],
 ) -> Result<Value<'gc>, Error<'gc>> {
-    movie_clip.drawing_mut(activation.gc()).clear();
+    movie_clip.drawing_mut().clear();
     Ok(Value::Undefined)
 }
 
@@ -983,13 +975,13 @@ pub fn clone_sprite<'gc>(
     parent.replace_at_depth(context, new_clip.into(), depth);
 
     // Copy display properties from previous clip to new clip.
-    new_clip.set_matrix(context.gc(), movie_clip.base().matrix());
-    new_clip.set_color_transform(context.gc(), movie_clip.base().color_transform());
+    new_clip.set_matrix(movie_clip.base().matrix());
+    new_clip.set_color_transform(movie_clip.base().color_transform());
 
     new_clip.init_clip_event_handlers(movie_clip.clip_actions().into());
 
     if let Some(drawing) = movie_clip.drawing().as_deref().cloned() {
-        *new_clip.drawing_mut(context.gc()) = drawing;
+        *new_clip.drawing_mut() = drawing;
     }
     // TODO: Any other properties we should copy...?
     // Definitely not Object properties.
@@ -1666,15 +1658,15 @@ fn set_transform<'gc>(
         if let NativeObject::Transform(transform) = object.native() {
             if let Some(clip) = transform.clip(activation) {
                 let matrix = clip.base().matrix();
-                this.set_matrix(activation.gc(), matrix);
+                this.set_matrix(matrix);
 
                 let color_transform = clip.base().color_transform();
-                this.set_color_transform(activation.gc(), color_transform);
+                this.set_color_transform(color_transform);
 
                 if let Some(parent) = this.parent() {
                     // Self-transform changes are automatically handled,
                     // we only want to inform ancestors to avoid unnecessary invalidations for tx/ty
-                    parent.invalidate_cached_bitmap(activation.gc());
+                    parent.invalidate_cached_bitmap();
                 }
 
                 this.set_transformed_by_script(true);
@@ -1712,12 +1704,12 @@ fn blend_mode<'gc>(
 
 fn set_blend_mode<'gc>(
     this: MovieClip<'gc>,
-    activation: &mut Activation<'_, 'gc>,
+    _activation: &mut Activation<'_, 'gc>,
     value: Value<'gc>,
 ) -> Result<(), Error<'gc>> {
     // No-op if value is not a valid blend mode.
     if let Some(mode) = value.as_blend_mode() {
-        this.set_blend_mode(activation.gc(), mode.into());
+        this.set_blend_mode(mode.into());
     } else {
         tracing::error!("Unknown blend mode {value:?}");
     }
@@ -1738,7 +1730,7 @@ fn set_cache_as_bitmap<'gc>(
     value: Value<'gc>,
 ) -> Result<(), Error<'gc>> {
     // Note that the *getter* returns actual, and *setter* is preference
-    this.set_bitmap_cached_preference(activation.gc(), value.as_bool(activation.swf_version()));
+    this.set_bitmap_cached_preference(value.as_bool(activation.swf_version()));
     Ok(())
 }
 
@@ -1759,12 +1751,9 @@ fn set_opaque_background<'gc>(
     value: Value<'gc>,
 ) -> Result<(), Error<'gc>> {
     if matches!(value, Value::Undefined | Value::Null) {
-        this.set_opaque_background(activation.gc(), None);
+        this.set_opaque_background(None);
     } else {
-        this.set_opaque_background(
-            activation.gc(),
-            Some(Color::from_rgb(value.coerce_to_u32(activation)?, 255)),
-        );
+        this.set_opaque_background(Some(Color::from_rgb(value.coerce_to_u32(activation)?, 255)));
     }
     Ok(())
 }
@@ -1796,7 +1785,7 @@ fn set_filters<'gc>(
             }
         }
     }
-    this.set_filters(activation.gc(), filters);
+    this.set_filters(filters);
     Ok(())
 }
 

core/src/avm1/globals/selection.rs

@@ -91,7 +91,7 @@ pub fn set_selection<'gc>(
             .unwrap_or(i32::MAX)
             .max(0);
         let selection = TextSelection::for_range(start as usize, end as usize);
-        edit_box.set_selection(Some(selection), activation.gc());
+        edit_box.set_selection(Some(selection));
     }
     Ok(Value::Undefined)
 }

core/src/avm1/globals/text_field.rs

@@ -249,10 +249,9 @@ fn replace_sel<'gc>(
         &text,
         activation.context,
     );
-    text_field.set_selection(
-        Some(TextSelection::for_position(selection.start() + text.len())),
-        activation.gc(),
-    );
+    text_field.set_selection(Some(TextSelection::for_position(
+        selection.start() + text.len(),
+    )));
 
     text_field.propagate_text_binding(activation);
 
@@ -390,7 +389,7 @@ pub fn set_background<'gc>(
     value: Value<'gc>,
 ) -> Result<(), Error<'gc>> {
     let has_background = value.as_bool(activation.swf_version());
-    this.set_has_background(activation.gc(), has_background);
+    this.set_has_background(has_background);
     Ok(())
 }
 
@@ -408,7 +407,7 @@ pub fn set_background_color<'gc>(
 ) -> Result<(), Error<'gc>> {
     let rgb = value.coerce_to_u32(activation)?;
     let color = Color::from_rgb(rgb, 255);
-    this.set_background_color(activation.gc(), color);
+    this.set_background_color(color);
     Ok(())
 }
 
@@ -425,7 +424,7 @@ pub fn set_border<'gc>(
     value: Value<'gc>,
 ) -> Result<(), Error<'gc>> {
     let has_border = value.as_bool(activation.swf_version());
-    this.set_has_border(activation.gc(), has_border);
+    this.set_has_border(has_border);
     Ok(())
 }
 
@@ -443,7 +442,7 @@ pub fn set_border_color<'gc>(
 ) -> Result<(), Error<'gc>> {
     let rgb = value.coerce_to_u32(activation)?;
     let color = Color::from_rgb(rgb, 255);
-    this.set_border_color(activation.gc(), color);
+    this.set_border_color(color);
     Ok(())
 }
 
@@ -651,7 +650,7 @@ pub fn set_hscroll<'gc>(
     // SWF v8 and earlier has the simple clamping behaviour below. SWF v9+ is much more complicated. See #4634.
     let hscroll_pixels = value.coerce_to_i32(activation)? as f64;
     let clamped = hscroll_pixels.clamp(0.0, this.maxhscroll());
-    this.set_hscroll(clamped, activation.context);
+    this.set_hscroll(clamped);
     Ok(())
 }
 
@@ -675,7 +674,7 @@ pub fn set_scroll<'gc>(
     value: Value<'gc>,
 ) -> Result<(), Error<'gc>> {
     let input = value.coerce_to_f64(activation)?;
-    this.set_scroll(input, activation.context);
+    this.set_scroll(input);
     Ok(())
 }
 
@@ -842,7 +841,7 @@ fn set_filters<'gc>(
             }
         }
     }
-    this.set_filters(activation.gc(), filters);
+    this.set_filters(filters);
     Ok(())
 }
 

core/src/avm1/globals/transform.rs

@@ -100,12 +100,12 @@ fn method<'gc>(
                     .all(|p| object.has_own_property(activation, *p));
                 if is_matrix {
                     let matrix = object_to_matrix(object, activation)?;
-                    clip.set_matrix(activation.gc(), matrix);
+                    clip.set_matrix(matrix);
                     clip.set_transformed_by_script(true);
                     if let Some(parent) = clip.parent() {
                         // Self-transform changes are automatically handled,
                         // we only want to inform ancestors to avoid unnecessary invalidations for tx/ty
-                        parent.invalidate_cached_bitmap(activation.gc());
+                        parent.invalidate_cached_bitmap();
                     }
                 }
             }
@@ -126,8 +126,8 @@ fn method<'gc>(
             if let [value] = args {
                 // Set only occurs for an object with actual ColorTransform data.
                 if let Some(color_transform) = ColorTransformObject::cast(*value) {
-                    clip.set_color_transform(activation.gc(), (*color_transform).clone().into());
-                    clip.invalidate_cached_bitmap(activation.gc());
+                    clip.set_color_transform((*color_transform).clone().into());
+                    clip.invalidate_cached_bitmap();
                     clip.set_transformed_by_script(true);
                 }
             }