diff --git a/core/src/avm1/script_object.rs b/core/src/avm1/script_object.rs index 1ed1e7eb4..6ab9156ec 100644 --- a/core/src/avm1/script_object.rs +++ b/core/src/avm1/script_object.rs @@ -11,7 +11,6 @@ use std::collections::{HashMap, HashSet}; pub const TYPE_OF_OBJECT: &str = "object"; pub const TYPE_OF_FUNCTION: &str = "function"; -pub const TYPE_OF_MOVIE_CLIP: &str = "movieclip"; #[derive(Debug, Copy, Clone, Collect)] #[collect(no_drop)] @@ -19,7 +18,6 @@ pub struct ScriptObject<'gc>(GcCell<'gc, ScriptObjectData<'gc>>); pub struct ScriptObjectData<'gc> { prototype: Option>, - display_object: Option>, values: HashMap>, function: Option>, type_of: &'static str, @@ -28,7 +26,6 @@ pub struct ScriptObjectData<'gc> { unsafe impl<'gc> Collect for ScriptObjectData<'gc> { fn trace(&self, cc: gc_arena::CollectionContext) { self.prototype.trace(cc); - self.display_object.trace(cc); self.values.trace(cc); self.function.trace(cc); } @@ -38,7 +35,6 @@ impl fmt::Debug for ScriptObjectData<'_> { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { f.debug_struct("Object") .field("prototype", &self.prototype) - .field("display_object", &self.display_object) .field("values", &self.values) .field("function", &self.function.is_some()) .finish() @@ -55,7 +51,6 @@ impl<'gc> ScriptObject<'gc> { ScriptObjectData { prototype: proto, type_of: TYPE_OF_OBJECT, - display_object: None, values: HashMap::new(), function: None, }, @@ -72,7 +67,6 @@ impl<'gc> ScriptObject<'gc> { ScriptObjectData { prototype: proto, type_of: TYPE_OF_OBJECT, - display_object: None, values: HashMap::new(), function: None, }, @@ -91,7 +85,6 @@ impl<'gc> ScriptObject<'gc> { ScriptObjectData { prototype: None, type_of: TYPE_OF_OBJECT, - display_object: None, values: HashMap::new(), function: None, }, @@ -110,7 +103,6 @@ impl<'gc> ScriptObject<'gc> { prototype: fn_proto, type_of: TYPE_OF_FUNCTION, function: Some(function.into()), - display_object: None, values: HashMap::new(), }, )) @@ -146,11 +138,6 @@ impl<'gc> ScriptObject<'gc> { function } - #[allow(dead_code)] - pub fn display_object(self) -> Option> { - self.0.read().display_object - } - /// Declare a native function on the current object. /// /// This is intended for use with defining host object prototypes. Notably, @@ -399,7 +386,7 @@ impl<'gc> TObject<'gc> for ScriptObject<'gc> { } /// Get the underlying display node for this object, if it exists. fn as_display_object(&self) -> Option> { - self.0.read().display_object + None } /// Returns a copy of a given function. diff --git a/core/src/avm1/stage_object.rs b/core/src/avm1/stage_object.rs index 629b59974..e975f9c96 100644 --- a/core/src/avm1/stage_object.rs +++ b/core/src/avm1/stage_object.rs @@ -3,7 +3,6 @@ use crate::avm1::function::Executable; use crate::avm1::property::Attribute; use crate::avm1::return_value::ReturnValue; -use crate::avm1::script_object::TYPE_OF_MOVIE_CLIP; use crate::avm1::{Avm1, Error, Object, ObjectPtr, ScriptObject, TObject, Value}; use crate::context::UpdateContext; use crate::display_object::DisplayObject; @@ -12,6 +11,9 @@ use gc_arena::{Collect, MutationContext}; use std::collections::HashSet; use std::fmt; +/// The type string for MovieClip objects. +pub const TYPE_OF_MOVIE_CLIP: &str = "movieclip"; + /// A ScriptObject that is inherently tied to a display node. #[derive(Clone, Copy, Collect)] #[collect(no_drop)]