core: Use interned strings for ClipEvent names

Author: Lord-McSweeney

core/src/display_object/avm1_button.rs

@@ -525,12 +525,12 @@ impl<'gc> TInteractiveObject<'gc> for Avm1Button<'gc> {
             // Queue ActionScript-defined event handlers after the SWF defined ones.
             // (e.g., clip.onRelease = foo).
             if self.should_fire_event_handlers(context, event) {
-                if let Some(name) = event.method_name() {
+                if let Some(name) = event.method_name(&context.strings) {
                     context.action_queue.queue_action(
                         self_display_object,
                         ActionType::Method {
                             object: self.0.object.get().unwrap(),
-                            name: name.into(),
+                            name,
                             args: vec![],
                         },
                         false,

core/src/display_object/movie_clip.rs

@@ -2330,7 +2330,10 @@ impl<'gc> MovieClip<'gc> {
                 ClipEvent::BUTTON_EVENT_METHODS
                     .iter()
                     .copied()
-                    .any(|handler| object.has_property(&mut activation, handler.into()))
+                    .any(|handler| {
+                        let handler = AvmString::new_utf8(activation.gc(), handler);
+                        object.has_property(&mut activation, handler)
+                    })
             } else {
                 false
             }
@@ -2989,12 +2992,12 @@ impl<'gc> TInteractiveObject<'gc> for MovieClip<'gc> {
                 // Queue ActionScript-defined event handlers after the SWF defined ones.
                 // (e.g., clip.onEnterFrame = foo).
                 if self.should_fire_event_handlers(context, event) {
-                    if let Some(name) = event.method_name() {
+                    if let Some(name) = event.method_name(&context.strings) {
                         context.action_queue.queue_action(
                             self.into(),
                             ActionType::Method {
                                 object,
-                                name: name.into(),
+                                name,
                                 args: vec![],
                             },
                             event == ClipEvent::Unload,

core/src/events.rs

@@ -1,4 +1,7 @@
-use crate::{display_object::InteractiveObject, input::InputEvent};
+use crate::display_object::InteractiveObject;
+use crate::input::InputEvent;
+use crate::string::{AvmString, StringContext};
+use ruffle_macros::istr;
 use std::str::FromStr;
 use swf::ClipEventFlag;
 
@@ -391,27 +394,27 @@ impl ClipEvent<'_> {
     /// `ClipEvent::Data` returns `None` rather than `onData` because its behavior
     /// differs from the other events: the method must fire before the SWF-defined
     /// event handler, so we'll explicitly call `onData` in the appropriate places.
-    pub const fn method_name(self) -> Option<&'static str> {
+    pub fn method_name<'gc>(self, ctx: &StringContext<'gc>) -> Option<AvmString<'gc>> {
         match self {
             ClipEvent::Construct => None,
             ClipEvent::Data => None,
-            ClipEvent::DragOut { .. } => Some("onDragOut"),
-            ClipEvent::DragOver { .. } => Some("onDragOver"),
-            ClipEvent::EnterFrame => Some("onEnterFrame"),
+            ClipEvent::DragOut { .. } => Some(istr!(ctx, "onDragOut")),
+            ClipEvent::DragOver { .. } => Some(istr!(ctx, "onDragOver")),
+            ClipEvent::EnterFrame => Some(istr!(ctx, "onEnterFrame")),
             ClipEvent::Initialize => None,
-            ClipEvent::KeyDown => Some("onKeyDown"),
+            ClipEvent::KeyDown => Some(istr!(ctx, "onKeyDown")),
             ClipEvent::KeyPress { .. } => None,
-            ClipEvent::KeyUp => Some("onKeyUp"),
-            ClipEvent::Load => Some("onLoad"),
-            ClipEvent::MouseDown => Some("onMouseDown"),
-            ClipEvent::MouseMove => Some("onMouseMove"),
-            ClipEvent::MouseUp => Some("onMouseUp"),
-            ClipEvent::Press { .. } => Some("onPress"),
-            ClipEvent::RollOut { .. } => Some("onRollOut"),
-            ClipEvent::RollOver { .. } => Some("onRollOver"),
-            ClipEvent::Release { .. } => Some("onRelease"),
-            ClipEvent::ReleaseOutside => Some("onReleaseOutside"),
-            ClipEvent::Unload => Some("onUnload"),
+            ClipEvent::KeyUp => Some(istr!(ctx, "onKeyUp")),
+            ClipEvent::Load => Some(istr!(ctx, "onLoad")),
+            ClipEvent::MouseDown => Some(istr!(ctx, "onMouseDown")),
+            ClipEvent::MouseMove => Some(istr!(ctx, "onMouseMove")),
+            ClipEvent::MouseUp => Some(istr!(ctx, "onMouseUp")),
+            ClipEvent::Press { .. } => Some(istr!(ctx, "onPress")),
+            ClipEvent::RollOut { .. } => Some(istr!(ctx, "onRollOut")),
+            ClipEvent::RollOver { .. } => Some(istr!(ctx, "onRollOver")),
+            ClipEvent::Release { .. } => Some(istr!(ctx, "onRelease")),
+            ClipEvent::ReleaseOutside => Some(istr!(ctx, "onReleaseOutside")),
+            ClipEvent::Unload => Some(istr!(ctx, "onUnload")),
             _ => None,
         }
     }

core/src/string/common.rs

@@ -192,6 +192,9 @@ define_common_strings! {
     str_onComplete: b"onComplete",
     str_onConnect: b"onConnect",
     str_onData: b"onData",
+    str_onDragOut: b"onDragOut",
+    str_onDragOver: b"onDragOver",
+    str_onEnterFrame: b"onEnterFrame",
     str_onFullScreen: b"onFullScreen",
     str_onIOError: b"onIOError",
     str_onHTTPError: b"onHTTPError",
@@ -209,9 +212,14 @@ define_common_strings! {
     str_onMouseUp: b"onMouseUp",
     str_onMouseWheel: b"onMouseWheel",
     str_onOpen: b"onOpen",
+    str_onPress: b"onPress",
     str_onProgress: b"onProgress",
+    str_onRelease: b"onRelease",
+    str_onReleaseOutside: b"onReleaseOutside",
     str_onResize: b"onResize",
     str_onResult: b"onResult",
+    str_onRollOut: b"onRollOut",
+    str_onRollOver: b"onRollOver",
     str_onScroller: b"onScroller",
     str_onSelect: b"onSelect",
     str_onSetFocus: b"onSetFocus",