core: Address reviews

Author: Lord-McSweeney

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

@@ -56,7 +56,7 @@ pub fn initialize_for_allocator<'gc>(
     // automatically be removed from the orphan list by
     // `OrphanManager::cleanup_dead_orphans`.
     if let Some(movie_clip) = dobj.as_movie_clip() {
-        movie_clip.add_as_orphan(context);
+        context.orphan_manager.add_orphan_obj(movie_clip.into());
     }
 
     obj.into()

core/src/display_object/movie_clip.rs

@@ -1949,14 +1949,6 @@ impl<'gc> MovieClip<'gc> {
         );
     }
 
-    /// Add this `MovieClip` to the global orphan list.
-    #[inline]
-    pub fn add_as_orphan(self, context: &mut UpdateContext<'gc>) {
-        assert!(self.is_avm2_orphan());
-
-        context.orphan_manager.add_orphan_obj(self.into());
-    }
-
     /// Allocate the AVM2 side of this object.
     ///
     /// This function does *not* call the constructor; it is intended that you
@@ -1977,7 +1969,7 @@ impl<'gc> MovieClip<'gc> {
         self.set_object2(context.gc(), object);
 
         if self.is_avm2_orphan() {
-            self.add_as_orphan(context);
+            context.orphan_manager.add_orphan_obj(self.into());
         }
     }
 

core/src/frame_lifecycle.rs

@@ -75,21 +75,21 @@ pub fn run_all_phases_avm2(context: &mut UpdateContext<'_>) {
     // We may still have AVM2 orphans that we need to run frames for even though
     // 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();
+    let is_root_movie_as3 = stage.movie().is_action_script_3();
 
     *context.frame_phase = FramePhase::Enter;
     OrphanManager::each_orphan_obj(context, |orphan, context| {
         orphan.enter_frame(context);
     });
-    if is_as3_root {
+    if is_root_movie_as3 {
         stage.enter_frame(context);
     }
 
     *context.frame_phase = FramePhase::Construct;
     OrphanManager::each_orphan_obj(context, |orphan, context| {
         orphan.construct_frame(context);
     });
-    if is_as3_root {
+    if is_root_movie_as3 {
         stage.construct_frame(context);
         stage.frame_constructed(context);
     }
@@ -98,13 +98,13 @@ pub fn run_all_phases_avm2(context: &mut UpdateContext<'_>) {
     OrphanManager::each_orphan_obj(context, |orphan, context| {
         orphan.run_frame_scripts(context);
     });
-    if is_as3_root {
+    if is_root_movie_as3 {
         stage.run_frame_scripts(context);
     }
     MovieClip::run_frame_script_cleanup(context);
 
     *context.frame_phase = FramePhase::Exit;
-    if is_as3_root {
+    if is_root_movie_as3 {
         stage.exit_frame(context);
     }