core: Improve AVM2 in AVM1

AVM2 movies loaded into AVM1 will now fire events to AVM1

Author: Lord-McSweeney

core/src/display_object.rs

@@ -1765,6 +1765,9 @@ pub trait TDisplayObject<'gc>:
     /// Returns the dot-syntax path to this display object, e.g. `_level0.foo.clip`
     #[no_dynamic]
     fn path(self) -> WString {
+        // FIXME this method doesn't work correclty when this DO is from an
+        // AVM2 movie that was loaded into AVM1
+
         if let Some(parent) = self.avm1_parent() {
             let mut path = parent.path();
             path.push_byte(b'.');

core/src/display_object/movie_clip.rs

@@ -187,8 +187,6 @@ pub struct MovieClipData<'gc> {
     attached_audio: Lock<Option<NetStream<'gc>>>,
 
     /// The next MovieClip in the AVM1 execution list.
-    ///
-    /// `None` in an AVM2 movie.
     next_avm1_clip: Lock<Option<MovieClip<'gc>>>,
 
     audio_stream: Cell<Option<SoundInstanceHandle>>,
@@ -421,8 +419,8 @@ impl<'gc> MovieClip<'gc> {
 
     /// Execute all other timeline actions on this object.
     pub fn run_frame_avm1(self, context: &mut UpdateContext<'gc>) {
-        if !self.movie().is_action_script_3() {
-            // Run my load/enterFrame clip event.
+        // Run my load/enterFrame clip event.
+        if !self.movie().is_action_script_3() || !context.root_swf.is_action_script_3() {
             let is_load_frame = !self.0.contains_flag(MovieClipFlags::INITIALIZED);
             if is_load_frame {
                 self.event_dispatch(context, ClipEvent::Load);
@@ -2608,7 +2606,7 @@ impl<'gc> TDisplayObject<'gc> for MovieClip<'gc> {
 
         self.set_default_instance_name(context);
 
-        if !self.movie().is_action_script_3() {
+        if !self.movie().is_action_script_3() || !context.root_swf.is_action_script_3() {
             context.avm1.add_to_exec_list(context.gc(), self);
 
             self.construct_as_avm1_object(context, init_object, instantiated_by, run_frame);

core/src/frame_lifecycle.rs

@@ -73,30 +73,40 @@ pub fn run_all_phases_avm2(context: &mut UpdateContext<'_>) {
     let stage = context.stage;
 
     // We may still have AVM2 orphans that we need to run frames for even though
-    // the root movie is AVM1 (TODO: is that correct?)
+    // the root movie is AVM1. However, we don't run any stage phases if the
+    // root movie is AVM1.
+    let is_as3_root = stage.movie().is_action_script_3();
 
     *context.frame_phase = FramePhase::Enter;
     OrphanManager::each_orphan_obj(context, |orphan, context| {
         orphan.enter_frame(context);
     });
-    stage.enter_frame(context);
+    if is_as3_root {
+        stage.enter_frame(context);
+    }
 
     *context.frame_phase = FramePhase::Construct;
     OrphanManager::each_orphan_obj(context, |orphan, context| {
         orphan.construct_frame(context);
     });
-    stage.construct_frame(context);
-    stage.frame_constructed(context);
+    if is_as3_root {
+        stage.construct_frame(context);
+        stage.frame_constructed(context);
+    }
 
     *context.frame_phase = FramePhase::FrameScripts;
     OrphanManager::each_orphan_obj(context, |orphan, context| {
         orphan.run_frame_scripts(context);
     });
-    stage.run_frame_scripts(context);
+    if is_as3_root {
+        stage.run_frame_scripts(context);
+    }
     MovieClip::run_frame_script_cleanup(context);
 
     *context.frame_phase = FramePhase::Exit;
-    stage.exit_frame(context);
+    if is_as3_root {
+        stage.exit_frame(context);
+    }
 
     // We cannot easily remove dead `GcWeak` instances from the orphan list
     // inside `each_orphan_movie`, since the callback may modify the orphan list.

core/src/orphan_manager.rs

@@ -90,8 +90,9 @@ impl<'gc> OrphanManager<'gc> {
                 // any orphan we see that has 'placed_by_script()' should stay on the orphan
                 // list, because it was not removed by a RemoveObject tag.
                 //
-                // Also, AVM2 MovieClips with an AVM1 parent are always orphans, since they
-                // would not run their frames if they weren't.
+                // Also, we consider AVM2 MovieClips loaded into an AVM1 parent to always
+                // be orphans, since we know they were placed by AVM1 code and not by
+                // the timeline.
                 dobj.placed_by_script() || has_avm1_parent
             } else {
                 false