core/render/web: replace uses of the Downcast trait with Any

Now that Rust supports trait upcasting, the direct dependency on `downcast-rs`
isn't needed anymore.

Author: moulins

Cargo.lock

@@ -30,7 +30,6 @@ smallvec = { version = "1.15.0", features = ["union"] }
 num-traits = { workspace = true }
 num-derive = { workspace = true }
 quick-xml = "0.37.4"
-downcast-rs = "2.0.1"
 url = { workspace = true }
 weak-table = "0.3.2"
 percent-encoding = "2.3.1"

core/Cargo.toml

@@ -19,6 +19,7 @@ use ruffle_macros::istr;
 use ruffle_render::filters::{
     DisplacementMapFilter, DisplacementMapFilterMode, Filter, ShaderFilter, ShaderObject,
 };
+use std::any::Any;
 use std::fmt::Debug;
 use swf::{
     BevelFilter, BevelFilterFlags, BlurFilter, BlurFilterFlags, Color, ColorMatrixFilter,
@@ -50,7 +51,7 @@ impl ShaderObject for ObjectWrapper {
     }
 
     fn equals(&self, other: &dyn ShaderObject) -> bool {
-        if let Some(other_wrapper) = other.downcast_ref::<ObjectWrapper>() {
+        if let Some(other_wrapper) = <dyn Any>::downcast_ref::<ObjectWrapper>(other) {
             std::ptr::eq(self.root.as_ptr(), other_wrapper.root.as_ptr())
         } else {
             false
@@ -857,9 +858,7 @@ fn shader_filter_to_avm2<'gc>(
     activation: &mut Activation<'_, 'gc>,
     filter: &ShaderFilter<'static>,
 ) -> Result<Value<'gc>, Error<'gc>> {
-    let object_wrapper: &ObjectWrapper = filter
-        .shader_object
-        .downcast_ref::<ObjectWrapper>()
+    let object_wrapper: &ObjectWrapper = <dyn Any>::downcast_ref(filter.shader_object.as_ref())
         .expect("ShaderObject was not an ObjectWrapper");
 
     let obj = *activation.context.dynamic_root.fetch(&object_wrapper.root);

core/src/avm2/filters.rs

@@ -1,3 +1,5 @@
+use std::any::Any;
+
 use crate::{
     avm1::{NativeObject, Object as Avm1Object},
     avm2::{Avm2, EventObject as Avm2EventObject, SoundChannelObject},
@@ -6,7 +8,6 @@ use crate::{
     display_object::{self, DisplayObject, MovieClip, TDisplayObject},
     string::AvmString,
 };
-use downcast_rs::Downcast;
 use gc_arena::Collect;
 use slotmap::{new_key_type, Key, SlotMap};
 
@@ -84,7 +85,7 @@ pub enum RegisterError {
     ShortMp3,
 }
 
-pub trait AudioBackend: Downcast {
+pub trait AudioBackend: Any {
     fn play(&mut self);
     fn pause(&mut self);
 
@@ -194,8 +195,6 @@ pub trait AudioBackend: Downcast {
     }
 }
 
-impl_downcast!(AudioBackend);
-
 /// Information about a sound provided to `NullAudioBackend`.
 struct NullSound {
     /// The duration of the sound in milliseconds.

core/src/backend/audio.rs

@@ -4,9 +4,9 @@ use crate::loader::Error;
 use crate::socket::{ConnectionState, SocketAction, SocketHandle};
 use crate::string::WStr;
 use async_channel::{Receiver, Sender};
-use downcast_rs::Downcast;
 use encoding_rs::Encoding;
 use indexmap::IndexMap;
+use std::any::Any;
 use std::borrow::Cow;
 use std::fmt;
 use std::fmt::Display;
@@ -227,7 +227,7 @@ pub struct ErrorResponse {
 pub type OwnedFuture<T, E> = Pin<Box<dyn Future<Output = Result<T, E>> + 'static>>;
 
 /// A backend interacting with a browser environment.
-pub trait NavigatorBackend: Downcast {
+pub trait NavigatorBackend: Any {
     /// Cause a browser navigation to a given URL.
     ///
     /// The URL given may be any URL scheme a browser can support. This may not
@@ -302,7 +302,6 @@ pub trait NavigatorBackend: Downcast {
         sender: Sender<SocketAction>,
     );
 }
-impl_downcast!(NavigatorBackend);
 
 #[cfg(not(target_family = "wasm"))]
 pub struct NullExecutor(futures::executor::LocalPool);

core/src/backend/navigator.rs

@@ -1,10 +1,9 @@
 use crate::backend::navigator::OwnedFuture;
 pub use crate::loader::Error as DialogLoaderError;
 use chrono::{DateTime, Utc};
-use downcast_rs::Downcast;
 use fluent_templates::loader::langid;
 pub use fluent_templates::LanguageIdentifier;
-use std::borrow::Cow;
+use std::{any::Any, borrow::Cow};
 use url::Url;
 
 pub type FullscreenError = Cow<'static, str>;
@@ -38,7 +37,7 @@ pub struct FileFilter {
 }
 
 /// A result of a file selection
-pub trait FileDialogResult: Downcast {
+pub trait FileDialogResult: Any {
     /// Was the file selection canceled by the user
     fn is_cancelled(&self) -> bool;
     fn creation_time(&self) -> Option<DateTime<Utc>>;
@@ -55,12 +54,11 @@ pub trait FileDialogResult: Downcast {
     /// the state at the time of the last refresh
     fn write_and_refresh(&mut self, data: &[u8]);
 }
-impl_downcast!(FileDialogResult);
 
 /// Future representing a file selection in process
 pub type DialogResultFuture = OwnedFuture<Box<dyn FileDialogResult>, DialogLoaderError>;
 
-pub trait UiBackend: Downcast {
+pub trait UiBackend: Any {
     fn mouse_visible(&self) -> bool;
 
     fn set_mouse_visible(&mut self, visible: bool);
@@ -129,7 +127,6 @@ pub trait UiBackend: Downcast {
     /// Mark that any previously open dialog has been closed
     fn close_file_dialog(&mut self);
 }
-impl_downcast!(UiBackend);
 
 /// A mouse cursor icon displayed by the Flash Player.
 /// Communicated from the core to the UI backend via `UiBackend::set_mouse_cursor`.

core/src/backend/ui.rs

@@ -12,9 +12,6 @@ pub use display_object::{StageAlign, StageDisplayState, StageScaleMode};
 #[macro_use]
 extern crate smallvec;
 
-#[macro_use]
-extern crate downcast_rs;
-
 #[macro_use]
 extern crate num_derive;
 

core/src/lib.rs

@@ -13,6 +13,7 @@ use ruffle_core::{Player, PlayerEvent};
 use ruffle_render_wgpu::backend::{request_adapter_and_device, WgpuRenderBackend};
 use ruffle_render_wgpu::descriptors::Descriptors;
 use ruffle_render_wgpu::utils::{format_list, get_backend_names};
+use std::any::Any;
 use std::sync::{Arc, MutexGuard};
 use std::time::{Duration, Instant};
 use url::Url;
@@ -329,11 +330,10 @@ impl GuiController {
         // If we're not in a UI, tell egui which cursor we prefer to use instead
         if !self.egui_winit.egui_ctx().wants_pointer_input() {
             if let Some(player) = player.as_deref() {
-                full_output.platform_output.cursor_icon = player
-                    .ui()
-                    .downcast_ref::<DesktopUiBackend>()
-                    .unwrap_or_else(|| panic!("UI Backend should be DesktopUiBackend"))
-                    .cursor();
+                full_output.platform_output.cursor_icon =
+                    <dyn Any>::downcast_ref::<DesktopUiBackend>(player.ui())
+                        .unwrap_or_else(|| panic!("UI Backend should be DesktopUiBackend"))
+                        .cursor();
             }
         }
         self.egui_winit
@@ -375,10 +375,9 @@ impl GuiController {
         );
 
         let movie_view = if let Some(player) = player.as_deref_mut() {
-            let renderer = player
-                .renderer_mut()
-                .downcast_mut::<WgpuRenderBackend<MovieView>>()
-                .expect("Renderer must be correct type");
+            let renderer =
+                <dyn Any>::downcast_ref::<WgpuRenderBackend<MovieView>>(player.renderer_mut())
+                    .expect("Renderer must be correct type");
             Some(renderer.target())
         } else {
             None

desktop/src/gui/controller.rs

@@ -11,6 +11,7 @@ use ruffle_render_wgpu::clap::{GraphicsBackend, PowerPreference};
 use ruffle_render_wgpu::descriptors::Descriptors;
 use ruffle_render_wgpu::target::TextureTarget;
 use ruffle_render_wgpu::wgpu;
+use std::any::Any;
 use std::fs::create_dir_all;
 use std::io::{self, Write};
 use std::panic::catch_unwind;
@@ -135,10 +136,10 @@ fn take_screenshot(
             let image = || {
                 player.lock().unwrap().render();
                 let mut player = player.lock().unwrap();
-                let renderer = player
-                    .renderer_mut()
-                    .downcast_mut::<WgpuRenderBackend<TextureTarget>>()
-                    .unwrap();
+                let renderer = <dyn Any>::downcast_mut::<WgpuRenderBackend<TextureTarget>>(
+                    player.renderer_mut(),
+                )
+                .unwrap();
                 renderer.capture_frame()
             };
             match catch_unwind(image) {

exporter/src/main.rs

@@ -18,7 +18,6 @@ gif = "0.13.1"
 png = "0.17.16"
 flate2 = { workspace = true }
 smallvec = { version = "1.15.0", features = ["union"] }
-downcast-rs = "2.0.1"
 lyon = { version = "1.0.1", optional = true }
 lyon_geom = "1.0.6"
 thiserror = { workspace = true }

render/Cargo.toml

@@ -17,6 +17,7 @@ use ruffle_render::quality::StageQuality;
 use ruffle_render::shape_utils::{DistilledShape, DrawCommand, LineScaleMode, LineScales};
 use ruffle_render::transform::Transform;
 use ruffle_web_common::{JsError, JsResult};
+use std::any::Any;
 use std::borrow::Cow;
 use std::sync::Arc;
 use swf::{BlendMode, Color, ColorTransform, Point, Twips};
@@ -52,8 +53,7 @@ struct ShapeData(Vec<CanvasDrawCommand>);
 impl ShapeHandleImpl for ShapeData {}
 
 fn as_shape_data(handle: &ShapeHandle) -> &ShapeData {
-    <dyn ShapeHandleImpl>::downcast_ref(&*handle.0)
-        .expect("Shape handle must be a Canvas ShapeData")
+    <dyn Any>::downcast_ref(&*handle.0).expect("Shape handle must be a Canvas ShapeData")
 }
 
 #[derive(Debug)]
@@ -155,8 +155,7 @@ struct BitmapData {
 impl BitmapHandleImpl for BitmapData {}
 
 fn as_bitmap_data(handle: &BitmapHandle) -> &BitmapData {
-    <dyn BitmapHandleImpl>::downcast_ref(&*handle.0)
-        .expect("Bitmap handle must be a Canvas BitmapData")
+    <dyn Any>::downcast_ref(&*handle.0).expect("Bitmap handle must be a Canvas BitmapData")
 }
 
 impl BitmapData {

render/canvas/src/lib.rs

@@ -7,8 +7,8 @@ use crate::filters::Filter;
 use crate::pixel_bender::{PixelBenderShader, PixelBenderShaderArgument, PixelBenderShaderHandle};
 use crate::quality::StageQuality;
 use crate::shape_utils::DistilledShape;
-use downcast_rs::{impl_downcast, Downcast};
 use ruffle_wstr::WStr;
+use std::any::Any;
 use std::borrow::Cow;
 use std::cell::RefCell;
 use std::fmt::Debug;
@@ -23,7 +23,7 @@ pub struct BitmapCacheEntry {
     pub filters: Vec<Filter>,
 }
 
-pub trait RenderBackend: Downcast {
+pub trait RenderBackend: Any {
     fn viewport_dimensions(&self) -> ViewportDimensions;
     // Do not call this method directly - use `player.set_viewport_dimensions`,
     // which will ensure that the stage is properly updated as well.
@@ -112,7 +112,6 @@ pub trait RenderBackend: Downcast {
         with_rgba: RgbaBufRead,
     ) -> Result<(), Error>;
 }
-impl_downcast!(RenderBackend);
 
 pub enum PixelBenderTarget {
     // The shader will write to the provided bitmap texture,
@@ -129,29 +128,24 @@ pub enum PixelBenderOutput {
     Bytes(Vec<u8>),
 }
 
-pub trait IndexBuffer: Downcast {}
-impl_downcast!(IndexBuffer);
-pub trait VertexBuffer: Downcast {}
-impl_downcast!(VertexBuffer);
+pub trait IndexBuffer: Any {}
+pub trait VertexBuffer: Any {}
 
-pub trait ShaderModule: Downcast {}
-impl_downcast!(ShaderModule);
+pub trait ShaderModule: Any {}
 
-pub trait Texture: Downcast + Debug {
+pub trait Texture: Any + Debug {
     fn width(&self) -> u32;
     fn height(&self) -> u32;
 }
-impl_downcast!(Texture);
 
-pub trait RawTexture: Downcast + Debug {
+pub trait RawTexture: Any + Debug {
     fn equals(&self, other: &dyn RawTexture) -> bool;
 }
-impl_downcast!(RawTexture);
 
 #[cfg(feature = "wgpu")]
 impl RawTexture for wgpu::Texture {
     fn equals(&self, other: &dyn RawTexture) -> bool {
-        if let Some(other_texture) = other.downcast_ref::<wgpu::Texture>() {
+        if let Some(other_texture) = (other as &dyn Any).downcast_ref::<wgpu::Texture>() {
             std::ptr::eq(self, other_texture)
         } else {
             false
@@ -241,7 +235,7 @@ pub enum ProgramType {
     Fragment,
 }
 
-pub trait Context3D: Downcast {
+pub trait Context3D: Any {
     fn profile(&self) -> Context3DProfile;
     // The BitmapHandle for the texture we're rendering to
     fn bitmap_handle(&self) -> BitmapHandle;
@@ -284,7 +278,6 @@ pub trait Context3D: Downcast {
 
     fn process_command(&mut self, command: Context3DCommand<'_>);
 }
-impl_downcast!(Context3D);
 
 #[derive(Copy, Clone, Debug)]
 pub enum Context3DVertexBufferFormat {
@@ -529,8 +522,7 @@ pub enum Context3DCommand<'a> {
 #[derive(Clone, Debug)]
 pub struct ShapeHandle(pub Arc<dyn ShapeHandleImpl>);
 
-pub trait ShapeHandleImpl: Downcast + Debug {}
-impl_downcast!(ShapeHandleImpl);
+pub trait ShapeHandleImpl: Any + Debug {}
 
 #[derive(Copy, Clone, Debug)]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]