core: Move exit_frame and frame_constructed to frame_lifecycle.rs

Also make them standalone functions instead of associated methods.

Previously, they were associated methods on `TDisplayObject`, but they didn't
actually access the `DisplayObject` they were called on

Author: Lord-McSweeney

core/src/display_object.rs

@@ -2,13 +2,11 @@ use crate::avm1::{
     ActivationIdentifier as Avm1ActivationIdentifier, Object as Avm1Object, Value as Avm1Value,
 };
 use crate::avm2::{
-    Activation as Avm2Activation, Avm2, Error as Avm2Error, EventObject as Avm2EventObject,
-    LoaderInfoObject, Multiname as Avm2Multiname, Object as Avm2Object,
-    StageObject as Avm2StageObject, TObject as _, Value as Avm2Value,
+    Activation as Avm2Activation, Error as Avm2Error, LoaderInfoObject, Multiname as Avm2Multiname,
+    Object as Avm2Object, StageObject as Avm2StageObject, TObject as _, Value as Avm2Value,
 };
 use crate::context::{RenderContext, UpdateContext};
 use crate::drawing::Drawing;
-use crate::loader::LoadManager;
 use crate::prelude::*;
 use crate::string::{AvmString, WString};
 use crate::tag_utils::SwfMovie;
@@ -2344,16 +2342,6 @@ pub trait TDisplayObject<'gc>:
         }
     }
 
-    /// Emit a `frameConstructed` event on this DisplayObject and any children it
-    /// may have.
-    #[no_dynamic]
-    fn frame_constructed(self, context: &mut UpdateContext<'gc>) {
-        let frame_constructed_evt =
-            Avm2EventObject::bare_default_event(context, "frameConstructed");
-        let dobject_constr = context.avm2.classes().display_object;
-        Avm2::broadcast_event(context, frame_constructed_evt, dobject_constr);
-    }
-
     /// Run any frame scripts (if they exist and this object needs to run them).
     fn run_frame_scripts(self, context: &mut UpdateContext<'gc>) {
         if let Some(container) = self.as_container() {
@@ -2363,16 +2351,6 @@ pub trait TDisplayObject<'gc>:
         }
     }
 
-    /// Emit an `exitFrame` broadcast event.
-    #[no_dynamic]
-    fn exit_frame(self, context: &mut UpdateContext<'gc>) {
-        let exit_frame_evt = Avm2EventObject::bare_default_event(context, "exitFrame");
-        let dobject_constr = context.avm2.classes().display_object;
-        Avm2::broadcast_event(context, exit_frame_evt, dobject_constr);
-
-        LoadManager::run_exit_frame(context);
-    }
-
     /// Called before the child is about to be rendered.
     /// Note that this happens even if the child is invisible
     /// (as long as the child is still on a render list)

core/src/display_object/avm2_button.rs

@@ -14,7 +14,9 @@ use crate::display_object::container::{dispatch_added_event, dispatch_removed_ev
 use crate::display_object::interactive::{InteractiveObjectBase, TInteractiveObject};
 use crate::display_object::{DisplayObjectBase, MovieClip};
 use crate::events::{ClipEvent, ClipEventResult};
-use crate::frame_lifecycle::catchup_display_object_to_frame;
+use crate::frame_lifecycle::{
+    broadcast_frame_constructed, broadcast_frame_exited, catchup_display_object_to_frame,
+};
 use crate::prelude::*;
 use crate::tag_utils::{SwfMovie, SwfSlice};
 use crate::vminterface::Instantiator;
@@ -363,15 +365,17 @@ impl<'gc> Avm2Button<'gc> {
                 dispatch_removed_event(old_state_child, context);
             }
 
-            if let Some(child) = child {
-                child.frame_constructed(context);
+            // FIXME is this correct?
+            if child.is_some() {
+                broadcast_frame_constructed(context);
             }
         }
 
         if is_cur_state {
             if let Some(child) = child {
                 child.run_frame_scripts(context);
-                child.exit_frame(context);
+                // FIXME is this correct?
+                broadcast_frame_exited(context);
             }
         }
     }
@@ -527,10 +531,10 @@ impl<'gc> TDisplayObject<'gc> for Avm2Button<'gc> {
 
                     let stage = context.stage;
                     stage.construct_frame(context);
-                    stage.frame_constructed(context);
+                    broadcast_frame_constructed(context);
                     self.set_state(context, ButtonState::Up);
                     stage.run_frame_scripts(context);
-                    stage.exit_frame(context);
+                    broadcast_frame_exited(context);
                 }
 
                 if let Some(avm2_object) = self.0.object.get() {

core/src/frame_lifecycle.rs

@@ -11,9 +11,11 @@
 //! runs in one phase, with timeline operations executing with all phases
 //! inline in the order that clips were originally created.
 
+use crate::avm2::{Avm2, EventObject};
 use crate::avm2_stub_method_context;
 use crate::context::UpdateContext;
 use crate::display_object::{DisplayObject, MovieClip, TDisplayObject};
+use crate::loader::LoadManager;
 use crate::orphan_manager::OrphanManager;
 use tracing::instrument;
 
@@ -87,7 +89,7 @@ pub fn run_all_phases_avm2(context: &mut UpdateContext<'_>) {
         orphan.construct_frame(context);
     });
     stage.construct_frame(context);
-    stage.frame_constructed(context);
+    broadcast_frame_constructed(context);
 
     *context.frame_phase = FramePhase::FrameScripts;
     OrphanManager::each_orphan_obj(context, |orphan, context| {
@@ -97,7 +99,7 @@ pub fn run_all_phases_avm2(context: &mut UpdateContext<'_>) {
     MovieClip::run_frame_script_cleanup(context);
 
     *context.frame_phase = FramePhase::Exit;
-    stage.exit_frame(context);
+    broadcast_frame_exited(context);
 
     // We cannot easily remove dead `GcWeak` instances from the orphan list
     // inside `each_orphan_movie`, since the callback may modify the orphan list.
@@ -151,7 +153,7 @@ pub fn run_inner_goto_frame<'gc>(
         orphan.construct_frame(context);
     });
     stage.construct_frame(context);
-    stage.frame_constructed(context);
+    broadcast_frame_constructed(context);
 
     *context.frame_phase = FramePhase::FrameScripts;
     stage.run_frame_scripts(context);
@@ -164,7 +166,7 @@ pub fn run_inner_goto_frame<'gc>(
     }
 
     *context.frame_phase = FramePhase::Exit;
-    stage.exit_frame(context);
+    broadcast_frame_exited(context);
 
     // We cannot easily remove dead `GcWeak` instances from the orphan list
     // inside `each_orphan_movie`, since the callback may modify the orphan list.
@@ -176,6 +178,22 @@ pub fn run_inner_goto_frame<'gc>(
     *context.frame_phase = old_phase;
 }
 
+/// Broadcast a `frameConstructed` event to all `DisplayObject`s.
+pub fn broadcast_frame_constructed<'gc>(context: &mut UpdateContext<'gc>) {
+    let frame_constructed_evt = EventObject::bare_default_event(context, "frameConstructed");
+    let dobject_constr = context.avm2.classes().display_object;
+    Avm2::broadcast_event(context, frame_constructed_evt, dobject_constr);
+}
+
+/// Broadcast a `exitFrame` event to all `DisplayObject`s.
+pub fn broadcast_frame_exited<'gc>(context: &mut UpdateContext<'gc>) {
+    let exit_frame_evt = EventObject::bare_default_event(context, "exitFrame");
+    let dobject_constr = context.avm2.classes().display_object;
+    Avm2::broadcast_event(context, exit_frame_evt, dobject_constr);
+
+    LoadManager::run_exit_frame(context);
+}
+
 /// Run all previously-executed frame phases on a newly-constructed display
 /// object.
 ///