core: Push propagating MovieClip events in front of the action queue

core/src/context.rs

@@ -470,6 +470,42 @@ impl<'gc> ActionQueue<'gc> {
         }
     }
 
+    /// Queues an action to run for the given movie clip to the front.
+    /// The action will be skipped if the clip is removed before the action runs.
+    pub fn queue_front_action(
+        &mut self,
+        clip: DisplayObject<'gc>,
+        action_type: ActionType<'gc>,
+        is_unload: bool,
+    ) {
+        let priority = action_type.priority();
+        let action = QueuedAction {
+            clip,
+            action_type,
+            is_unload,
+        };
+        debug_assert!(priority < Self::NUM_PRIORITIES);
+        if let Some(queue) = self.action_queue.get_mut(priority) {
+            queue.push_front(action)
+        }
+    }
+
+    /// Conditionally queues an action to run for the given movie clip to either the front (true), or the back (false).
+    /// The action will be skipped if the clip is removed before the action runs.
+    pub fn queue_front_or_back_action(
+        &mut self,
+        clip: DisplayObject<'gc>,
+        action_type: ActionType<'gc>,
+        is_unload: bool,
+        is_front: bool,
+    ) {
+        if is_front {
+            self.queue_front_action(clip, action_type, is_unload);
+        } else {
+            self.queue_action(clip, action_type, is_unload);
+        }
+    }
+
     /// Sorts and drains the actions from the queue.
     pub fn pop_action(&mut self) -> Option<QueuedAction<'gc>> {
         self.action_queue

core/src/display_object/movie_clip.rs

@@ -3003,12 +3003,13 @@ impl<'gc> TInteractiveObject<'gc> for MovieClip<'gc> {
                             }
                         }
 
-                        context.action_queue.queue_action(
+                        context.action_queue.queue_front_or_back_action(
                             self.into(),
                             ActionType::Normal {
                                 bytecode: event_handler.action_data.clone(),
                             },
                             event == ClipEvent::Unload,
+                            event.propagates(),
                         );
                     }
                 }
@@ -3019,14 +3020,15 @@ impl<'gc> TInteractiveObject<'gc> for MovieClip<'gc> {
                     if let Some(name) = event.method_name() {
                         // Keyboard events don't fire their methods unless the MovieClip has focus (#2120).
                         if !event.is_key_event() || read.has_focus {
-                            context.action_queue.queue_action(
+                            context.action_queue.queue_front_or_back_action(
                                 self.into(),
                                 ActionType::Method {
                                     object,
                                     name,
                                     args: vec![],
                                 },
                                 event == ClipEvent::Unload,
+                                event.propagates(),
                             );
                         }
                     }

tests/tests/swfs/avm1/propagated_clip_event_order/input.json

@@ -0,0 +1,59 @@
+[
+    {
+        "type": "MouseMove",
+        "pos": [295.0, 180.0]
+    },
+    {
+        "type": "MouseDown",
+        "pos": [295.0, 180.0],
+        "btn": "Left"
+    },
+    {
+        "type": "Wait"
+    },
+    {
+        "type": "MouseUp",
+        "pos": [295.0, 180.0],
+        "btn": "Left"
+    },
+    {
+        "type": "Wait"
+    },
+    {
+        "type": "MouseMove",
+        "pos": [340.0, 180.0]
+    },
+    {
+        "type": "MouseDown",
+        "pos": [340.0, 180.0],
+        "btn": "Left"
+    },
+    {
+        "type": "Wait"
+    },
+    {
+        "type": "MouseUp",
+        "pos": [340.0, 180.0],
+        "btn": "Left"
+    },
+    {
+        "type": "Wait"
+    },
+    {
+        "type": "MouseMove",
+        "pos": [320.0, 180.0]
+    },
+    {
+        "type": "MouseDown",
+        "pos": [320.0, 180.0],
+        "btn": "Left"
+    },
+    {
+        "type": "Wait"
+    },
+    {
+        "type": "MouseUp",
+        "pos": [320.0, 180.0],
+        "btn": "Left"
+    }
+]

tests/tests/swfs/avm1/propagated_clip_event_order/output.txt

@@ -0,0 +1,6 @@
+button_2: _parent.val: 0
+button_1: _parent.val: 2
+button_1: _parent.button_2.val[_parent.val]: 2
+button_1: _parent.val: 1
+button_1: _parent.button_2.val[_parent.val]: 1
+button_2: _parent.val: 1

tests/tests/swfs/avm1/propagated_clip_event_order/test.toml

@@ -0,0 +1 @@
+num_ticks = 5