core: make swf::Rectangle Copy

`Rectangle<Twips>` is cheap to copy, being only 16 bytes, so requiring an explicit
`.clone()` call is unnecessary ceremony.

Has the nice side-effect of replacing some `RefCell`s by `Cell`s.

Author: moulins

core/src/avm1/globals/movie_clip.rs

@@ -1449,7 +1449,7 @@ fn get_bounds<'gc>(
             // the final matrix, but this matches Flash's behavior.
             let to_global_matrix = movie_clip.local_to_global_matrix();
             let to_target_matrix = target.global_to_local_matrix().unwrap_or_default();
-            let target_bounds = to_target_matrix * to_global_matrix * bounds.clone();
+            let target_bounds = to_target_matrix * to_global_matrix * bounds;
 
             // If the bounds are invalid, the target space is identical to the origin space and
             // use_new_invalid_bounds_value is true, the returned bounds use a specific invalid value.

core/src/debug_ui/display_object.rs

@@ -120,7 +120,7 @@ impl DisplayObjectWindow {
     }
 
     pub fn hovered_bounds(&self) -> Option<Rectangle<Twips>> {
-        self.hovered_bounds.clone()
+        self.hovered_bounds
     }
 
     pub fn show<'gc>(

core/src/display_object.rs

@@ -1721,11 +1721,11 @@ pub trait TDisplayObject<'gc>:
     }
 
     fn scroll_rect(&self) -> Option<Rectangle<Twips>> {
-        self.base().scroll_rect.clone()
+        self.base().scroll_rect
     }
 
     fn next_scroll_rect(&self) -> Rectangle<Twips> {
-        self.base().next_scroll_rect.clone()
+        self.base().next_scroll_rect
     }
 
     fn set_next_scroll_rect(&self, gc_context: &Mutation<'gc>, rectangle: Rectangle<Twips>) {
@@ -1738,7 +1738,7 @@ pub trait TDisplayObject<'gc>:
     }
 
     fn scaling_grid(&self) -> Rectangle<Twips> {
-        self.base().scaling_grid.clone()
+        self.base().scaling_grid
     }
 
     fn set_scaling_grid(&self, gc_context: &Mutation<'gc>, rect: Rectangle<Twips>) {
@@ -2107,9 +2107,7 @@ pub trait TDisplayObject<'gc>:
     fn pre_render(&self, context: &mut RenderContext<'_, 'gc>) {
         let mut this = self.base_mut(context.gc());
         this.clear_invalidate_flag();
-        this.scroll_rect = this
-            .has_scroll_rect()
-            .then(|| this.next_scroll_rect.clone());
+        this.scroll_rect = this.has_scroll_rect().then(|| this.next_scroll_rect);
     }
 
     fn render_self(&self, _context: &mut RenderContext<'_, 'gc>) {}

core/src/display_object/avm1_button.rs

@@ -611,7 +611,7 @@ impl<'gc> TInteractiveObject<'gc> for Avm1Button<'gc> {
         // usually change on hover (children are swapped out),
         // which would cause the automatic tab order to change during tabbing.
         // That could potentially create a loop in the tab ordering (soft locking the tab).
-        self.local_to_global_matrix() * self.0.cell.borrow().hit_bounds.clone()
+        self.local_to_global_matrix() * self.0.cell.borrow().hit_bounds
     }
 }
 

core/src/display_object/edit_text.rs

@@ -42,9 +42,9 @@ use ruffle_render::commands::CommandHandler;
 use ruffle_render::quality::StageQuality;
 use ruffle_render::transform::Transform;
 use ruffle_wstr::WStrToUtf8;
-use std::cell::RefCell;
+use std::cell::{Cell, Ref, RefMut};
 use std::collections::VecDeque;
-use std::{cell::Ref, cell::RefMut, sync::Arc};
+use std::sync::Arc;
 use swf::ColorTransform;
 use unic_segment::WordBoundIndices;
 
@@ -118,16 +118,14 @@ pub struct EditTextData<'gc> {
     layout: Layout<'gc>,
 
     /// The current intrinsic bounds of the text field.
-    #[collect(require_static)]
-    bounds: RefCell<Rectangle<Twips>>,
+    bounds: Cell<Rectangle<Twips>>,
 
     /// Lazily calculated autosize bounds.
     ///
     /// When `None`, no new bounds should be applied.
     /// When `Some`, new bounds resulting from autosize are
     /// waiting to be applied, see [`EditText::apply_autosize_bounds`].
-    #[collect(require_static)]
-    autosize_lazy_bounds: RefCell<Option<Rectangle<Twips>>>,
+    autosize_lazy_bounds: Cell<Option<Rectangle<Twips>>>,
 
     /// The AVM1 object handle
     object: Option<AvmObject<'gc>>,
@@ -361,8 +359,8 @@ impl<'gc> EditText<'gc> {
                 border_color: Color::BLACK,
                 object: None,
                 layout,
-                bounds: RefCell::new(swf_tag.bounds().clone()),
-                autosize_lazy_bounds: RefCell::new(None),
+                bounds: Cell::new(*swf_tag.bounds()),
+                autosize_lazy_bounds: Cell::new(None),
                 autosize,
                 variable: variable.map(|s| s.to_string_lossy(encoding)),
                 bound_stage_object: None,
@@ -810,7 +808,7 @@ impl<'gc> EditText<'gc> {
     /// Returns the matrix for transforming from layout
     /// coordinate space into this object's local space.
     fn layout_to_local_matrix(self, data: &EditTextData) -> Matrix {
-        let bounds = data.bounds.borrow();
+        let bounds = data.bounds.get();
         Matrix::translate(
             bounds.x_min + Self::GUTTER - Twips::from_pixels(data.hscroll),
             bounds.y_min + Self::GUTTER - data.vertical_scroll_offset(),
@@ -920,7 +918,7 @@ impl<'gc> EditText<'gc> {
 
         // Determine the internal width available for content layout.
         let content_width = if autosize == AutoSizeMode::None || is_word_wrap {
-            Some(edit_text.bounds.borrow().width() - padding)
+            Some(edit_text.bounds.get().width() - padding)
         } else {
             None
         };
@@ -942,7 +940,7 @@ impl<'gc> EditText<'gc> {
 
         let text_size = edit_text.layout.text_size();
 
-        let mut autosize_bounds = edit_text.bounds.borrow().clone();
+        let mut autosize_bounds = edit_text.bounds.get();
         if autosize != AutoSizeMode::None {
             if !is_word_wrap {
                 // The edit text's bounds needs to have the padding baked in.
@@ -966,7 +964,7 @@ impl<'gc> EditText<'gc> {
             let height = text_size.height() + padding;
             autosize_bounds.set_height(height);
         }
-        *edit_text.autosize_lazy_bounds.borrow_mut() = Some(autosize_bounds);
+        edit_text.autosize_lazy_bounds.set(Some(autosize_bounds));
         drop(edit_text);
         self.invalidate_cached_bitmap(context.gc());
     }
@@ -995,7 +993,7 @@ impl<'gc> EditText<'gc> {
     pub fn apply_autosize_bounds(self) {
         let edit_text: Ref<'_, EditTextData<'gc>> = self.0.read();
         if let Some(bounds) = edit_text.autosize_lazy_bounds.take() {
-            *edit_text.bounds.borrow_mut() = bounds;
+            edit_text.bounds.set(bounds);
             // Note: We do not have to invalidate cache here.
             //   Cache has already been invalidated on relayout, and
             //   we will apply this anyway before render.
@@ -1020,7 +1018,7 @@ impl<'gc> EditText<'gc> {
         }
 
         let mut text_width = edit_text.layout.text_size().width();
-        let window_width = (edit_text.bounds.borrow().width() - Self::GUTTER * 2).max(Twips::ZERO);
+        let window_width = (edit_text.bounds.get().width() - Self::GUTTER * 2).max(Twips::ZERO);
 
         if !edit_text.flags.contains(EditTextFlag::READ_ONLY) {
             // input fields get extra space at the end
@@ -1047,7 +1045,7 @@ impl<'gc> EditText<'gc> {
         }
 
         let text_height = edit_text.layout.text_size().height();
-        let window_height = edit_text.bounds.borrow().height() - Self::GUTTER * 2;
+        let window_height = edit_text.bounds.get().height() - Self::GUTTER * 2;
 
         // That's the y coordinate where the fully scrolled window begins.
         // We have to find a line that's below this coordinate.
@@ -1076,7 +1074,7 @@ impl<'gc> EditText<'gc> {
         let scroll_offset = lines
             .get(edit_text.scroll - 1)
             .map_or(Twips::ZERO, |l| l.offset_y());
-        let target = edit_text.bounds.borrow().height() + scroll_offset - Self::GUTTER * 2;
+        let target = edit_text.bounds.get().height() + scroll_offset - Self::GUTTER * 2;
 
         // TODO Use binary search here
         // Line before first line with extent greater than bounds.height() + line "scroll"'s offset
@@ -1250,7 +1248,7 @@ impl<'gc> EditText<'gc> {
         //      culls any other line which is not fully visible; masking is always used for left/right bounds
         // TODO: also cull text that's simply out of screen, just like we cull whole DOs in render_self().
         if origin.y() + Self::GUTTER - edit_text.vertical_scroll_offset()
-            > edit_text.bounds.borrow().height()
+            > edit_text.bounds.get().height()
         {
             return;
         }
@@ -2304,7 +2302,7 @@ impl<'gc> EditText<'gc> {
         let edit_text = self.0.read();
 
         // Check bounds
-        let bounds = edit_text.bounds.borrow().clone().grow(-Self::GUTTER);
+        let bounds = edit_text.bounds.get().grow(-Self::GUTTER);
         if !bounds.contains(position) {
             return None;
         }
@@ -2611,7 +2609,7 @@ impl<'gc> TDisplayObject<'gc> for EditText<'gc> {
     fn self_bounds(&self) -> Rectangle<Twips> {
         self.apply_autosize_bounds();
 
-        self.0.read().bounds.borrow().clone()
+        self.0.read().bounds.get()
     }
 
     fn pixel_bounds(&self) -> Rectangle<Twips> {
@@ -2621,7 +2619,7 @@ impl<'gc> TDisplayObject<'gc> for EditText<'gc> {
         // are applied when reading anything related to bounds.
         let old = self.0.read().autosize_lazy_bounds.take();
         let bounds = self.world_bounds();
-        *self.0.read().autosize_lazy_bounds.borrow_mut() = old;
+        self.0.read().autosize_lazy_bounds.set(old);
         bounds
     }
 
@@ -2630,15 +2628,15 @@ impl<'gc> TDisplayObject<'gc> for EditText<'gc> {
         self.apply_autosize_bounds();
 
         let edit_text = self.0.read();
-        let offset = edit_text.bounds.borrow().x_min;
+        let offset = edit_text.bounds.get().x_min;
         edit_text.base.base.x() + offset
     }
 
     fn set_x(&self, gc_context: &Mutation<'gc>, x: Twips) {
         self.apply_autosize_bounds();
 
         let mut edit_text = self.0.write(gc_context);
-        let offset = edit_text.bounds.borrow().x_min;
+        let offset = edit_text.bounds.get().x_min;
         edit_text.base.base.set_x(x - offset);
         drop(edit_text);
         self.invalidate_cached_bitmap(gc_context);
@@ -2648,15 +2646,15 @@ impl<'gc> TDisplayObject<'gc> for EditText<'gc> {
         self.apply_autosize_bounds();
 
         let edit_text = self.0.read();
-        let offset = edit_text.bounds.borrow().y_min;
+        let offset = edit_text.bounds.get().y_min;
         edit_text.base.base.y() + offset
     }
 
     fn set_y(&self, gc_context: &Mutation<'gc>, y: Twips) {
         self.apply_autosize_bounds();
 
         let mut edit_text = self.0.write(gc_context);
-        let offset = edit_text.bounds.borrow().y_min;
+        let offset = edit_text.bounds.get().y_min;
         edit_text.base.base.set_y(y - offset);
         drop(edit_text);
         self.invalidate_cached_bitmap(gc_context);
@@ -2666,8 +2664,8 @@ impl<'gc> TDisplayObject<'gc> for EditText<'gc> {
         self.apply_autosize_bounds();
 
         let edit_text = self.0.read();
-        let bounds = edit_text.bounds.borrow();
-        (edit_text.base.base.transform.matrix * bounds.clone())
+        let bounds = edit_text.bounds.get();
+        (edit_text.base.base.transform.matrix * bounds)
             .width()
             .to_pixels()
     }
@@ -2676,10 +2674,8 @@ impl<'gc> TDisplayObject<'gc> for EditText<'gc> {
         self.apply_autosize_bounds();
 
         let mut edit_text = self.0.write(context.gc());
-        edit_text
-            .bounds
-            .borrow_mut()
-            .set_width(Twips::from_pixels(value));
+        let bounds = &edit_text.bounds;
+        bounds.set(bounds.get().with_width(Twips::from_pixels(value)));
         edit_text.base.base.set_transformed_by_script(true);
         drop(edit_text);
         self.relayout(context);
@@ -2689,8 +2685,8 @@ impl<'gc> TDisplayObject<'gc> for EditText<'gc> {
         self.apply_autosize_bounds();
 
         let edit_text = self.0.read();
-        let bounds = edit_text.bounds.borrow();
-        (edit_text.base.base.transform.matrix * bounds.clone())
+        let bounds = edit_text.bounds.get();
+        (edit_text.base.base.transform.matrix * bounds)
             .height()
             .to_pixels()
     }
@@ -2699,10 +2695,8 @@ impl<'gc> TDisplayObject<'gc> for EditText<'gc> {
         self.apply_autosize_bounds();
 
         let mut edit_text = self.0.write(context.gc());
-        edit_text
-            .bounds
-            .borrow_mut()
-            .set_height(Twips::from_pixels(value));
+        let bounds = &edit_text.bounds;
+        bounds.set(bounds.get().with_height(Twips::from_pixels(value)));
         edit_text.base.base.set_transformed_by_script(true);
         drop(edit_text);
         self.relayout(context);
@@ -2746,22 +2740,22 @@ impl<'gc> TDisplayObject<'gc> for EditText<'gc> {
             if self.is_device_font() {
                 self.draw_device_text_box(
                     context,
-                    edit_text.bounds.borrow().clone(),
+                    edit_text.bounds.get(),
                     background_color,
                     border_color,
                 );
             } else {
                 self.draw_text_box(
                     context,
-                    edit_text.bounds.borrow().clone(),
+                    edit_text.bounds.get(),
                     background_color,
                     border_color,
                 );
             }
         }
 
         context.commands.push_mask();
-        let mask = Matrix::create_box_from_rectangle(&edit_text.bounds.borrow());
+        let mask = Matrix::create_box_from_rectangle(&edit_text.bounds.get());
         context.commands.draw_rect(
             Color::WHITE,
             context.transform_stack.transform().matrix * mask,

core/src/display_object/graphic.rs

@@ -51,7 +51,7 @@ impl<'gc> Graphic<'gc> {
         let library = context.library.library_for_movie(movie.clone()).unwrap();
         let shared = GraphicShared {
             id: swf_shape.id,
-            bounds: swf_shape.shape_bounds.clone(),
+            bounds: swf_shape.shape_bounds,
             render_handle: Some(
                 context
                     .renderer
@@ -140,9 +140,9 @@ impl<'gc> TDisplayObject<'gc> for Graphic<'gc> {
 
     fn self_bounds(&self) -> Rectangle<Twips> {
         if let Some(drawing) = &self.0.read().drawing {
-            drawing.self_bounds().clone()
+            drawing.self_bounds()
         } else {
-            self.0.read().shared.bounds.clone()
+            self.0.read().shared.bounds
         }
     }
 

core/src/display_object/morph_shape.rs

@@ -152,7 +152,7 @@ impl<'gc> TDisplayObject<'gc> for MorphShape<'gc> {
         let ratio = self.0.ratio.get();
         let shared = self.0.shared.get();
         let frame = shared.get_frame(ratio);
-        frame.bounds.clone()
+        frame.bounds
     }
 
     fn hit_test_shape(
@@ -366,8 +366,8 @@ impl MorphShapeShared {
         let shape = swf::Shape {
             version: 4,
             id: 0,
-            shape_bounds: bounds.clone(),
-            edge_bounds: bounds.clone(),
+            shape_bounds: bounds,
+            edge_bounds: bounds,
             flags: swf::ShapeFlag::HAS_SCALING_STROKES,
             styles,
             shape,

core/src/display_object/movie_clip.rs

@@ -2697,9 +2697,7 @@ impl<'gc> TDisplayObject<'gc> for MovieClip<'gc> {
     }
 
     fn self_bounds(&self) -> Rectangle<Twips> {
-        self.drawing()
-            .map(|d| d.self_bounds().clone())
-            .unwrap_or_default()
+        self.drawing().map(|d| d.self_bounds()).unwrap_or_default()
     }
 
     fn hit_test_shape(

core/src/display_object/stage.rs

@@ -451,7 +451,7 @@ impl<'gc> Stage<'gc> {
     }
 
     pub fn view_bounds(self) -> Rectangle<Twips> {
-        self.0.read().view_bounds.clone()
+        self.0.read().view_bounds
     }
 
     pub fn show_menu(self) -> bool {

core/src/display_object/text.rs

@@ -52,7 +52,7 @@ impl<'gc> Text<'gc> {
                     TextShared {
                         swf,
                         id: tag.id,
-                        bounds: tag.bounds.clone(),
+                        bounds: tag.bounds,
                         text_transform: tag.matrix.into(),
                         text_blocks: tag.records.clone(),
                     },
@@ -194,7 +194,7 @@ impl<'gc> TDisplayObject<'gc> for Text<'gc> {
     }
 
     fn self_bounds(&self) -> Rectangle<Twips> {
-        self.0.read().shared.bounds.clone()
+        self.0.read().shared.bounds
     }
 
     fn hit_test_shape(