AVM2 Queued Tags & Looping Gotos fixes

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

@@ -10,6 +10,7 @@ use crate::avm2::Error;
 use crate::avm2::Namespace;
 use crate::avm2::QName;
 use crate::display_object::{HitTestOptions, TDisplayObject};
+use crate::frame_lifecycle::catchup_display_object_to_frame;
 use crate::string::AvmString;
 use crate::types::{Degrees, Percent};
 use crate::vminterface::Instantiator;
@@ -57,7 +58,7 @@ pub fn native_instance_init<'gc>(
                 child.set_object2(activation.context.gc_context, this);
 
                 child.post_instantiation(&mut activation.context, None, Instantiator::Avm2, false);
-                child.construct_frame(&mut activation.context);
+                catchup_display_object_to_frame(&mut activation.context, child);
             }
         }
     }

core/src/context.rs

@@ -15,6 +15,7 @@ use crate::context_menu::ContextMenuState;
 use crate::display_object::{EditText, InteractiveObject, MovieClip, SoundTransform, Stage};
 use crate::external::ExternalInterface;
 use crate::focus_tracker::FocusTracker;
+use crate::frame_lifecycle::FramePhase;
 use crate::library::Library;
 use crate::loader::LoadManager;
 use crate::player::Player;
@@ -168,6 +169,11 @@ pub struct UpdateContext<'a, 'gc, 'gc_context> {
 
     /// Amount of actions performed since the last timeout check
     pub actions_since_timeout_check: &'a mut u16,
+
+    /// The current frame processing phase.
+    ///
+    /// If we are not doing frame processing, then this is `FramePhase::Enter`.
+    pub frame_phase: &'a mut FramePhase,
 }
 
 /// Convenience methods for controlling audio.
@@ -327,6 +333,7 @@ impl<'a, 'gc, 'gc_context> UpdateContext<'a, 'gc, 'gc_context> {
             time_offset: self.time_offset,
             frame_rate: self.frame_rate,
             actions_since_timeout_check: self.actions_since_timeout_check,
+            frame_phase: self.frame_phase,
         }
     }
 

core/src/display_object.rs

@@ -1094,20 +1094,10 @@ pub trait TDisplayObject<'gc>:
             .set_instantiated_by_timeline(value);
     }
 
-    /// Emit an `enterFrame` event on this DisplayObject and any children it
-    /// may have.
-    fn enter_frame(&self, context: &mut UpdateContext<'_, 'gc, '_>) {
-        let enter_frame_evt = Avm2EventObject::bare_default_event(context, "enterFrame");
-
-        let dobject_constr = context.avm2.classes().display_object;
-
-        if let Err(e) = Avm2::broadcast_event(context, enter_frame_evt, dobject_constr) {
-            log::error!(
-                "Encountered AVM2 error when broadcasting enterFrame event: {}",
-                e
-            );
-        }
-    }
+    /// Run any start-of-frame actions for this display object.
+    ///
+    /// When fired on `Stage`, this also emits the AVM2 `enterFrame` broadcast.
+    fn enter_frame(&self, _context: &mut UpdateContext<'_, 'gc, '_>) {}
 
     /// Construct all display objects that the timeline indicates should exist
     /// this frame, and their children.

core/src/display_object/avm2_button.rs

@@ -12,6 +12,7 @@ use crate::display_object::interactive::{
 };
 use crate::display_object::{DisplayObjectBase, DisplayObjectPtr, MovieClip, TDisplayObject};
 use crate::events::{ClipEvent, ClipEventResult};
+use crate::frame_lifecycle::catchup_display_object_to_frame;
 use crate::prelude::*;
 use crate::tag_utils::{SwfMovie, SwfSlice};
 use crate::vminterface::Instantiator;
@@ -224,15 +225,15 @@ impl<'gc> Avm2Button<'gc> {
 
             child.set_parent(context.gc_context, Some(self.into()));
             child.post_instantiation(context, None, Instantiator::Movie, false);
-            child.construct_frame(context);
+            catchup_display_object_to_frame(context, child);
 
             (child, false)
         } else {
             let state_sprite = MovieClip::new(movie, context.gc_context);
 
             state_sprite.set_avm2_class(context.gc_context, Some(sprite_class));
             state_sprite.set_parent(context.gc_context, Some(self.into()));
-            state_sprite.construct_frame(context);
+            catchup_display_object_to_frame(context, state_sprite.into());
 
             for (child, depth) in children {
                 // `parent` returns `null` for these grandchildren during construction time, even though
@@ -242,7 +243,7 @@ impl<'gc> Avm2Button<'gc> {
                 state_sprite.replace_at_depth(context, child, depth.into());
                 child.set_parent(context.gc_context, Some(self.into()));
                 child.post_instantiation(context, None, Instantiator::Movie, false);
-                child.construct_frame(context);
+                catchup_display_object_to_frame(context, child);
                 child.set_parent(context.gc_context, Some(state_sprite.into()));
             }
 
@@ -428,6 +429,28 @@ impl<'gc> TDisplayObject<'gc> for Avm2Button<'gc> {
         self.set_state(context, ButtonState::Up);
     }
 
+    fn enter_frame(&self, context: &mut UpdateContext<'_, 'gc, '_>) {
+        let hit_area = self.0.read().hit_area;
+        if let Some(hit_area) = hit_area {
+            hit_area.enter_frame(context);
+        }
+
+        let up_state = self.0.read().up_state;
+        if let Some(up_state) = up_state {
+            up_state.enter_frame(context);
+        }
+
+        let down_state = self.0.read().down_state;
+        if let Some(down_state) = down_state {
+            down_state.enter_frame(context);
+        }
+
+        let over_state = self.0.read().over_state;
+        if let Some(over_state) = over_state {
+            over_state.enter_frame(context);
+        }
+    }
+
     fn construct_frame(&self, context: &mut UpdateContext<'_, 'gc, '_>) {
         let hit_area = self.0.read().hit_area;
         if let Some(hit_area) = hit_area {