core: Store BitmapDataObject instead of Avm2Object in BitmapData

Author: Lord-McSweeney

core/src/avm2/globals/flash/display/bitmap.rs

@@ -56,7 +56,7 @@ pub fn bitmap_allocator<'gc>(
                 let new_bitmap_data = fill_bitmap_data_from_symbol(activation, bitmap.compressed());
                 let bitmap_data_obj =
                     BitmapDataObject::from_bitmap_data(activation.context, new_bitmap_data);
-                new_bitmap_data.init_object2(activation.gc(), bitmap_data_obj.into());
+                new_bitmap_data.init_object2(activation.gc(), bitmap_data_obj);
 
                 let child = Bitmap::new_with_bitmap_data(
                     activation.gc(),
@@ -124,12 +124,12 @@ pub fn get_bitmap_data<'gc>(
     let this = this.as_object().unwrap();
 
     if let Some(bitmap) = this.as_display_object().and_then(|dobj| dobj.as_bitmap()) {
-        let mut value = bitmap.bitmap_data().object2();
+        let value = bitmap
+            .bitmap_data()
+            .object2()
+            .map(|o| o.into())
+            .unwrap_or(Value::Null);
 
-        // AS3 expects an unset BitmapData to be null, not 'undefined'
-        if matches!(value, Value::Undefined) {
-            value = Value::Null;
-        }
         return Ok(value);
     }
 

core/src/avm2/globals/flash/display/bitmap_data.rs

@@ -142,7 +142,7 @@ pub fn init<'gc>(
         )
     };
 
-    new_bitmap_data.init_object2(activation.gc(), this);
+    new_bitmap_data.init_object2(activation.gc(), bitmap_data_obj);
     bitmap_data_obj.init_bitmap_data(activation.gc(), new_bitmap_data);
 
     Ok(Value::Undefined)

core/src/avm2/object/bitmapdata_object.rs

@@ -80,7 +80,7 @@ impl<'gc> BitmapDataObject<'gc> {
             },
         ));
 
-        bitmap_data.init_object2(mc, instance.into());
+        bitmap_data.init_object2(mc, instance);
 
         instance
     }
@@ -101,7 +101,7 @@ impl<'gc> BitmapDataObject<'gc> {
     }
 
     /// This should only be called to initialize the association between an AVM
-    /// object and it's associated bitmap data. This association should not be
+    /// object and its associated bitmap data. This association should not be
     /// reinitialized later.
     pub fn init_bitmap_data(self, mc: &Mutation<'gc>, new_bitmap: BitmapData<'gc>) {
         unlock!(Gc::write(mc, self.0), BitmapDataObjectData, bitmap_data).set(new_bitmap);

core/src/bitmap/bitmap_data.rs

@@ -1,4 +1,4 @@
-use crate::avm2::{Object as Avm2Object, Value as Avm2Value};
+use crate::avm2::object::BitmapDataObject;
 use crate::context::RenderContext;
 use crate::display_object::{DisplayObject, DisplayObjectWeak, TDisplayObject};
 use bitflags::bitflags;
@@ -300,7 +300,7 @@ impl<'gc> BitmapData<'gc> {
         self.0.width()
     }
 
-    pub fn object2(&self) -> Avm2Value<'gc> {
+    pub fn object2(&self) -> Option<BitmapDataObject<'gc>> {
         self.0.object2()
     }
 
@@ -323,7 +323,7 @@ impl<'gc> BitmapData<'gc> {
         self.0.dispose(mc);
     }
 
-    pub fn init_object2(&self, mc: &Mutation<'gc>, object: Avm2Object<'gc>) {
+    pub fn init_object2(&self, mc: &Mutation<'gc>, object: BitmapDataObject<'gc>) {
         self.0.init_object2(mc, object);
     }
 
@@ -389,7 +389,7 @@ pub struct BitmapRawData<'gc> {
     ///
     /// AVM1 cannot retrieve `BitmapData` back from the display object tree, so
     /// this does not need to hold an AVM1 object.
-    avm2_object: Option<Avm2Object<'gc>>,
+    avm2_object: Option<BitmapDataObject<'gc>>,
 
     /// A list of display objects that are backed by this BitmapData
     display_objects: Vec<DisplayObjectWeak<'gc>>,
@@ -417,7 +417,7 @@ pub enum DirtyState {
 }
 
 mod wrapper {
-    use crate::avm2::{Object as Avm2Object, Value as Avm2Value};
+    use crate::avm2::object::BitmapDataObject;
     use crate::context::RenderContext;
     use crate::display_object::DisplayObjectWeak;
     use gc_arena::barrier::Write;
@@ -611,7 +611,7 @@ mod wrapper {
             self.0.borrow().width
         }
 
-        pub fn object2(&self) -> Avm2Value<'gc> {
+        pub fn object2(&self) -> Option<BitmapDataObject<'gc>> {
             self.0.borrow().object2()
         }
 
@@ -643,8 +643,8 @@ mod wrapper {
             self.0.borrow_mut(mc).dispose();
         }
 
-        pub fn init_object2(&self, mc: &Mutation<'gc>, object: Avm2Object<'gc>) {
-            self.0.borrow_mut(mc).avm2_object = Some(object)
+        pub fn init_object2(&self, mc: &Mutation<'gc>, object: BitmapDataObject<'gc>) {
+            self.0.borrow_mut(mc).avm2_object = Some(object);
         }
 
         pub fn remove_display_object(&self, mc: &Mutation<'gc>, callback: DisplayObjectWeak<'gc>) {
@@ -934,14 +934,12 @@ impl<'gc> BitmapRawData<'gc> {
         }
     }
 
-    pub fn object2(&self) -> Avm2Value<'gc> {
+    pub fn object2(&self) -> Option<BitmapDataObject<'gc>> {
         self.avm2_object
-            .map(|o| o.into())
-            .unwrap_or(Avm2Value::Null)
     }
 
-    pub fn init_object2(&mut self, object: Avm2Object<'gc>) {
-        self.avm2_object = Some(object)
+    pub fn init_object2(&mut self, object: BitmapDataObject<'gc>) {
+        self.avm2_object = Some(object);
     }
 }