avm2: Remove three more uses of coerce_to_object, used in Stage3D t…

…exture handling
ruffle-rs · Oct 10, 2024 · 6c8d5b0 · 6c8d5b0
1 parent e1d3dd1
commit 6c8d5b0
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/core/src/avm2/globals/flash/display3D/textures/cube_texture.rs b/core/src/avm2/globals/flash/display3D/textures/cube_texture.rs
@@ -83,7 +83,9 @@ pub fn upload_from_bitmap_data<'gc>(
     args: &[Value<'gc>],
 ) -> Result<Value<'gc>, Error<'gc>> {
     if let Some(texture) = this.as_texture() {
-        if let Some(source) = args[0].coerce_to_object(activation)?.as_bitmap_data() {
+        let source_obj = args.get_object(activation, 0, "source")?;
+
+        if let Some(source) = source_obj.as_bitmap_data() {
             let side = args[1].coerce_to_u32(activation)?;
             let mip_level = args[2].coerce_to_u32(activation)?;
             if mip_level == 0 {

diff --git a/core/src/avm2/globals/flash/display3D/textures/rectangle_texture.rs b/core/src/avm2/globals/flash/display3D/textures/rectangle_texture.rs
@@ -25,7 +25,9 @@ pub fn upload_from_bitmap_data<'gc>(
     args: &[Value<'gc>],
 ) -> Result<Value<'gc>, Error<'gc>> {
     if let Some(texture) = this.as_texture() {
-        if let Some(source) = args[0].coerce_to_object(activation)?.as_bitmap_data() {
+        let source_obj = args.get_object(activation, 0, "source")?;
+
+        if let Some(source) = source_obj.as_bitmap_data() {
             texture.context3d().copy_bitmapdata_to_texture(
                 source.sync(activation.context.renderer),
                 texture.handle(),

diff --git a/core/src/avm2/globals/flash/display3D/textures/texture.rs b/core/src/avm2/globals/flash/display3D/textures/texture.rs
@@ -117,7 +117,9 @@ pub fn upload_from_bitmap_data<'gc>(
     args: &[Value<'gc>],
 ) -> Result<Value<'gc>, Error<'gc>> {
     if let Some(texture) = this.as_texture() {
-        if let Some(source) = args[0].coerce_to_object(activation)?.as_bitmap_data() {
+        let source_obj = args.get_object(activation, 0, "source")?;
+
+        if let Some(source) = source_obj.as_bitmap_data() {
             let mip_level = args[1].coerce_to_u32(activation)?;
             if mip_level == 0 {
                 texture.context3d().copy_bitmapdata_to_texture(