core/avm2: Support SWFv9 code moving around AVM1Movies in the display list

Author: Lord-McSweeney

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

@@ -40,7 +40,7 @@ fn validate_add_operation<'gc>(
         )?));
     }
 
-    if !proposed_child.movie().is_action_script_3() {
+    if !proposed_child.movie().is_action_script_3() && activation.context.root_swf.version() > 9 {
         return Err(Error::avm_error(argument_error(
             activation,
             "Error #2180: It is illegal to move AVM1 content (AS1 or AS2) to a different part of the displayList when it has been loaded into AVM2 (AS3) content.",

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

@@ -131,7 +131,7 @@ pub fn get_bytes_loaded<'gc>(
 
 /// `content` getter
 pub fn get_content<'gc>(
-    activation: &mut Activation<'_, 'gc>,
+    _activation: &mut Activation<'_, 'gc>,
     this: Value<'gc>,
     _args: &[Value<'gc>],
 ) -> Result<Value<'gc>, Error<'gc>> {
@@ -145,18 +145,7 @@ pub fn get_content<'gc>(
     let loader_stream = loader_info.loader_stream();
     match &*loader_stream {
         LoaderStream::Swf(_, root) | LoaderStream::NotYetLoaded(_, Some(root), _) => {
-            if root.movie().is_action_script_3() || !root.movie().is_movie() {
-                Ok(root.object2())
-            } else {
-                // The movie was an AVM1 movie, return an AVM1Movie object
-                let root_obj = *root;
-                drop(loader_stream);
-
-                let loader_info = this.as_loader_info_object().unwrap();
-                Ok(loader_info
-                    .get_or_init_avm1movie(activation, root_obj)
-                    .into())
-            }
+            Ok(root.object2())
         }
         _ => Ok(Value::Null),
     }

core/src/avm2/object/loaderinfo_object.rs

@@ -2,7 +2,7 @@
 
 use crate::avm2::activation::Activation;
 use crate::avm2::object::script_object::ScriptObjectData;
-use crate::avm2::object::{EventObject, Object, StageObject, TObject};
+use crate::avm2::object::{EventObject, Object, TObject};
 use crate::avm2::{Avm2, Error, Value};
 use crate::context::UpdateContext;
 use crate::display_object::DisplayObject;
@@ -314,29 +314,6 @@ impl<'gc> LoaderInfoObject<'gc> {
         self.0.content_type.set(content_type);
     }
 
-    /// Returns the AVM1Movie corresponding to the loaded movie- if
-    /// it doesn't exist yet, creates it.
-    pub fn get_or_init_avm1movie(
-        &self,
-        activation: &mut Activation<'_, 'gc>,
-        obj: DisplayObject<'gc>,
-    ) -> Object<'gc> {
-        let cached_avm1movie = self.0.cached_avm1movie.get();
-        if cached_avm1movie.is_none() {
-            let class_object = activation.avm2().classes().avm1movie;
-            let object = StageObject::for_display_object(activation.gc(), obj, class_object);
-
-            unlock!(
-                Gc::write(activation.gc(), self.0),
-                LoaderInfoObjectData,
-                cached_avm1movie
-            )
-            .set(Some(object.into()));
-        }
-
-        self.0.cached_avm1movie.get().unwrap()
-    }
-
     pub fn unload(&self, activation: &mut Activation<'_, 'gc>) {
         // Reset properties
         let movie = &activation.context.root_swf;

core/src/display_object/movie_clip.rs

@@ -1874,6 +1874,15 @@ impl<'gc> MovieClip<'gc> {
         }
     }
 
+    /// Called on an AVM1 MovieClip that has been loaded by AVM2 (i.e. a
+    /// mixed-AVM MovieClip) to create its AVM2-side `AVM1Movie` object.
+    pub fn set_avm1movie(self, context: &mut UpdateContext<'gc>) {
+        let class_object = context.avm2.classes().avm1movie;
+        let object = Avm2StageObject::for_display_object(context.gc(), self.into(), class_object);
+
+        self.set_object2(context, object);
+    }
+
     pub fn register_frame_script(
         self,
         frame_id: FrameNumber,

core/src/loader.rs

@@ -2137,6 +2137,9 @@ impl<'gc> Loader<'gc> {
                         mc.post_instantiation(uc, None, Instantiator::Movie, false);
 
                         mc.set_depth(LOADER_INSERTED_AVM1_DEPTH);
+
+                        // We also need to create its AVM2-side object, the `AVM1Movie`.
+                        mc.set_avm1movie(uc);
                     }
 
                     if from_bytes {