core: Always implement TDisplayObject::as_ptr in term of base

Author: moulins

core/src/display_object.rs

@@ -1130,6 +1130,11 @@ pub trait TDisplayObject<'gc>:
 {
     fn base(self) -> Gc<'gc, DisplayObjectBase<'gc>>;
 
+    #[no_dynamic]
+    fn as_ptr(self) -> *const DisplayObjectPtr {
+        Gc::as_ptr(self.base()).cast()
+    }
+
     /// The `SCALE_ROTATION_CACHED` flag should only be set in SWFv5+.
     /// So scaling/rotation values always have to get recalculated from the matrix in SWFv4.
     #[no_dynamic]
@@ -2398,8 +2403,6 @@ pub trait TDisplayObject<'gc>:
 
     fn instantiate(self, gc_context: &Mutation<'gc>) -> DisplayObject<'gc>;
 
-    fn as_ptr(self) -> *const DisplayObjectPtr;
-
     /// Whether this object can be used as a mask.
     /// If this returns false and this object is used as a mask, the mask will not be applied.
     /// This is used by movie clips to disable the mask when there are no children, for example.

core/src/display_object/avm1_button.rs

@@ -8,7 +8,7 @@ use crate::display_object::container::{
 use crate::display_object::interactive::{
     Avm2MousePick, InteractiveObject, InteractiveObjectBase, TInteractiveObject,
 };
-use crate::display_object::{Avm1TextFieldBinding, DisplayObjectBase, DisplayObjectPtr};
+use crate::display_object::{Avm1TextFieldBinding, DisplayObjectBase};
 use crate::events::{ClipEvent, ClipEventResult};
 use crate::prelude::*;
 use crate::string::AvmString;
@@ -253,10 +253,6 @@ impl<'gc> TDisplayObject<'gc> for Avm1Button<'gc> {
         Self(Gc::new(mc, data.clone())).into()
     }
 
-    fn as_ptr(self) -> *const DisplayObjectPtr {
-        Gc::as_ptr(self.0) as *const DisplayObjectPtr
-    }
-
     fn id(self) -> CharacterId {
         self.0.shared.id
     }

core/src/display_object/avm2_button.rs

@@ -12,7 +12,7 @@ use crate::context::{RenderContext, UpdateContext};
 use crate::display_object::avm1_button::{ButtonState, ButtonTracking};
 use crate::display_object::container::{dispatch_added_event, dispatch_removed_event};
 use crate::display_object::interactive::{InteractiveObjectBase, TInteractiveObject};
-use crate::display_object::{DisplayObjectBase, DisplayObjectPtr, MovieClip};
+use crate::display_object::{DisplayObjectBase, MovieClip};
 use crate::events::{ClipEvent, ClipEventResult};
 use crate::frame_lifecycle::catchup_display_object_to_frame;
 use crate::prelude::*;
@@ -416,10 +416,6 @@ impl<'gc> TDisplayObject<'gc> for Avm2Button<'gc> {
         Self(Gc::new(mc, (*self.0).clone())).into()
     }
 
-    fn as_ptr(self) -> *const DisplayObjectPtr {
-        Gc::as_ptr(self.0) as *const DisplayObjectPtr
-    }
-
     fn id(self) -> CharacterId {
         self.0.shared.id
     }

core/src/display_object/bitmap.rs

@@ -312,10 +312,6 @@ impl<'gc> TDisplayObject<'gc> for Bitmap<'gc> {
         Self(Gc::new(gc_context, self.0.as_ref().clone())).into()
     }
 
-    fn as_ptr(self) -> *const DisplayObjectPtr {
-        Gc::as_ptr(self.0) as *const DisplayObjectPtr
-    }
-
     fn id(self) -> CharacterId {
         self.0.id
     }

core/src/display_object/edit_text.rs

@@ -14,7 +14,7 @@ use crate::context::{RenderContext, UpdateContext};
 use crate::display_object::interactive::{
     InteractiveObject, InteractiveObjectBase, TInteractiveObject,
 };
-use crate::display_object::{Avm1TextFieldBinding, DisplayObjectBase, DisplayObjectPtr};
+use crate::display_object::{Avm1TextFieldBinding, DisplayObjectBase};
 use crate::events::{
     ClipEvent, ClipEventResult, ImeCursorArea, ImeEvent, ImeNotification, ImePurpose,
     PlayerNotification, TextControlCode,
@@ -2525,10 +2525,6 @@ impl<'gc> TDisplayObject<'gc> for EditText<'gc> {
         Self(Gc::new(gc_context, self.0.as_ref().clone())).into()
     }
 
-    fn as_ptr(self) -> *const DisplayObjectPtr {
-        Gc::as_ptr(self.0) as *const DisplayObjectPtr
-    }
-
     fn id(self) -> CharacterId {
         self.0.shared.id
     }

core/src/display_object/graphic.rs

@@ -4,7 +4,7 @@ use crate::avm2::{
     StageObject as Avm2StageObject,
 };
 use crate::context::{RenderContext, UpdateContext};
-use crate::display_object::{DisplayObjectBase, DisplayObjectPtr};
+use crate::display_object::DisplayObjectBase;
 use crate::drawing::Drawing;
 use crate::library::MovieLibrarySource;
 use crate::prelude::*;
@@ -132,10 +132,6 @@ impl<'gc> TDisplayObject<'gc> for Graphic<'gc> {
         Self(Gc::new(gc_context, self.0.as_ref().clone())).into()
     }
 
-    fn as_ptr(self) -> *const DisplayObjectPtr {
-        Gc::as_ptr(self.0) as *const DisplayObjectPtr
-    }
-
     fn id(self) -> CharacterId {
         self.0.shared.get().id
     }

core/src/display_object/loader_display.rs

@@ -74,10 +74,6 @@ impl<'gc> TDisplayObject<'gc> for LoaderDisplay<'gc> {
         Self(Gc::new(gc_context, self.0.as_ref().clone())).into()
     }
 
-    fn as_ptr(self) -> *const DisplayObjectPtr {
-        Gc::as_ptr(self.0) as *const DisplayObjectPtr
-    }
-
     fn id(self) -> CharacterId {
         u16::MAX
     }

core/src/display_object/morph_shape.rs

@@ -2,7 +2,7 @@ use crate::avm2::{
     Activation as Avm2Activation, Object as Avm2Object, StageObject as Avm2StageObject,
 };
 use crate::context::{RenderContext, UpdateContext};
-use crate::display_object::{DisplayObjectBase, DisplayObjectPtr};
+use crate::display_object::DisplayObjectBase;
 use crate::library::{Library, MovieLibrarySource};
 use crate::prelude::*;
 use crate::tag_utils::SwfMovie;
@@ -77,10 +77,6 @@ impl<'gc> TDisplayObject<'gc> for MorphShape<'gc> {
         Self(Gc::new(gc_context, self.0.as_ref().clone())).into()
     }
 
-    fn as_ptr(self) -> *const DisplayObjectPtr {
-        Gc::as_ptr(self.0) as *const DisplayObjectPtr
-    }
-
     fn id(self) -> CharacterId {
         self.0.shared.get().id
     }

core/src/display_object/movie_clip.rs

@@ -2251,10 +2251,6 @@ impl<'gc> TDisplayObject<'gc> for MovieClip<'gc> {
         Self(Gc::new(mc, (*self.0).clone())).into()
     }
 
-    fn as_ptr(self) -> *const DisplayObjectPtr {
-        Gc::as_ptr(self.0) as *const DisplayObjectPtr
-    }
-
     fn id(self) -> CharacterId {
         self.0.id()
     }

core/src/display_object/stage.rs

@@ -11,7 +11,7 @@ use crate::config::Letterbox;
 use crate::context::{RenderContext, UpdateContext};
 use crate::display_object::container::ChildContainer;
 use crate::display_object::interactive::{InteractiveObjectBase, TInteractiveObject};
-use crate::display_object::{render_base, DisplayObjectBase, DisplayObjectPtr};
+use crate::display_object::{render_base, DisplayObjectBase};
 use crate::events::{ClipEvent, ClipEventResult};
 use crate::focus_tracker::FocusTracker;
 use crate::prelude::*;
@@ -744,10 +744,6 @@ impl<'gc> TDisplayObject<'gc> for Stage<'gc> {
         Self(Gc::new(gc_context, self.0.as_ref().clone())).into()
     }
 
-    fn as_ptr(self) -> *const DisplayObjectPtr {
-        Gc::as_ptr(self.0) as *const DisplayObjectPtr
-    }
-
     fn local_to_global_matrix(self) -> Matrix {
         // The stage is in Stage coordinates by definition
         Default::default()