render: Made ShapeHandle an Arc of an internal, droppable mesh

Author: Dinnerbone

core/src/display_object/graphic.rs

@@ -190,7 +190,7 @@ impl<'gc> TDisplayObject<'gc> for Graphic<'gc> {
 
         if let Some(drawing) = &self.0.read().drawing {
             drawing.render(context);
-        } else if let Some(render_handle) = self.0.read().static_data.render_handle {
+        } else if let Some(render_handle) = self.0.read().static_data.render_handle.clone() {
             context
                 .commands
                 .render_shape(render_handle, context.transform_stack.transform())

core/src/display_object/morph_shape.rs

@@ -194,7 +194,7 @@ impl MorphShapeStatic {
         ratio: u16,
     ) -> ShapeHandle {
         let mut frame = self.get_frame(ratio);
-        if let Some(handle) = frame.shape_handle {
+        if let Some(handle) = frame.shape_handle.clone() {
             handle
         } else {
             let library = library.library_for_movie(self.movie.clone()).unwrap();
@@ -205,7 +205,7 @@ impl MorphShapeStatic {
                     gc_context: context.gc_context,
                 },
             );
-            frame.shape_handle = Some(handle);
+            frame.shape_handle = Some(handle.clone());
             handle
         }
     }

core/src/drawing.rs

@@ -4,13 +4,13 @@ use ruffle_render::backend::{RenderBackend, ShapeHandle};
 use ruffle_render::bitmap::{BitmapHandle, BitmapInfo, BitmapSize, BitmapSource};
 use ruffle_render::commands::CommandHandler;
 use ruffle_render::shape_utils::{DistilledShape, DrawCommand, DrawPath, FillRule};
-use std::cell::Cell;
+use std::cell::{Cell, RefCell};
 use swf::{FillStyle, LineStyle, Rectangle, Twips};
 
 #[derive(Clone, Debug, Collect)]
 #[collect(require_static)]
 pub struct Drawing {
-    render_handle: Cell<Option<ShapeHandle>>,
+    render_handle: RefCell<Option<ShapeHandle>>,
     shape_bounds: Rectangle<Twips>,
     edge_bounds: Rectangle<Twips>,
     dirty: Cell<bool>,
@@ -33,7 +33,7 @@ impl Default for Drawing {
 impl Drawing {
     pub fn new() -> Self {
         Self {
-            render_handle: Cell::new(None),
+            render_handle: RefCell::new(None),
             shape_bounds: Default::default(),
             edge_bounds: Default::default(),
             dirty: Cell::new(false),
@@ -50,7 +50,7 @@ impl Drawing {
 
     pub fn from_swf_shape(shape: &swf::Shape) -> Self {
         let mut this = Self {
-            render_handle: Cell::new(None),
+            render_handle: RefCell::new(None),
             shape_bounds: shape.shape_bounds.clone(),
             edge_bounds: shape.edge_bounds.clone(),
             dirty: Cell::new(true),
@@ -305,10 +305,10 @@ impl Drawing {
                 id: 0,
             };
             self.render_handle
-                .set(Some(context.renderer.register_shape(shape, self)));
+                .replace(Some(context.renderer.register_shape(shape, self)));
         }
 
-        if let Some(handle) = self.render_handle.get() {
+        if let Some(handle) = self.render_handle.borrow().to_owned() {
             context
                 .commands
                 .render_shape(handle, context.transform_stack.transform());

core/src/font.rs

@@ -4,7 +4,7 @@ use crate::string::WStr;
 use gc_arena::{Collect, Gc, MutationContext};
 use ruffle_render::backend::{RenderBackend, ShapeHandle};
 use ruffle_render::transform::Transform;
-use std::cell::{Cell, Ref, RefCell};
+use std::cell::{Ref, RefCell};
 use std::cmp::max;
 
 pub use swf::TextGridFit;
@@ -126,7 +126,7 @@ impl<'gc> Font<'gc> {
             };
             let glyph_code = swf_glyph.code;
             let glyph = Glyph {
-                shape_handle: Cell::new(handle),
+                shape_handle: RefCell::new(handle),
                 advance: swf_glyph.advance,
                 shape: RefCell::new(None),
                 swf_glyph,
@@ -419,7 +419,7 @@ pub struct Glyph {
     pub advance: i16,
     // Handle to registered shape.
     // If None, it'll be loaded lazily on first render of this glyph.
-    shape_handle: Cell<Option<ShapeHandle>>,
+    shape_handle: RefCell<Option<ShapeHandle>>,
     // Same shape as one in swf_glyph, but wrapped in an swf::Shape;
     // For use in hit tests. Created lazily on first use.
     // (todo: refactor hit tests to not require this?
@@ -431,11 +431,11 @@ pub struct Glyph {
 
 impl Glyph {
     pub fn shape_handle(&self, renderer: &mut dyn RenderBackend) -> ShapeHandle {
-        if self.shape_handle.get().is_none() {
+        if self.shape_handle.borrow().is_none() {
             self.shape_handle
-                .set(Some(renderer.register_glyph_shape(&self.swf_glyph)))
+                .replace(Some(renderer.register_glyph_shape(&self.swf_glyph)));
         }
-        self.shape_handle.get().unwrap()
+        self.shape_handle.borrow().clone().unwrap()
     }
 
     pub fn as_shape(&self) -> Ref<'_, swf::Shape> {