liangsheng8708
/
ruffle
mirror of https://mirror.ghproxy.com/https://github.com/ruffle-rs/ruffle.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

avm2: Remove dead code from MovieClip constructor 

The call to `super_init` will initialize a `DisplayObject` (if unset)
in the `Sprite` constructor, using exactly the same logic that we're
attempting to use. The code in `MovieClip` is unreachable, and can
be deleted.
This commit is contained in:
Aaron Hill 2022-10-23 21:09:37 -05:00
parent 84f3739ece
commit 7dcb333991
1 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
core/src/avm2/globals/flash/display/movieclip.rs
View File

@ -12,9 +12,7 @@ use crate::avm2::Namespace;
use crate::avm2::QName;
use crate::display_object::{MovieClip, Scene, TDisplayObject};
use crate::string::{AvmString, WString};
use crate::tag_utils::SwfMovie;
use gc_arena::{GcCell, MutationContext};
use std::sync::Arc;
/// Implements `flash.display.MovieClip`'s instance constructor.
pub fn instance_init<'gc>(
@ -24,17 +22,6 @@ pub fn instance_init<'gc>(
) -> Result<Value<'gc>, Error<'gc>> {
if let Some(this) = this {
activation.super_init(this, &[])?;
if this.as_display_object().is_none() {
let class_object = this
.instance_of()
.ok_or("Attempted to construct MovieClip on a bare object")?;
let movie = Arc::new(SwfMovie::empty(activation.context.swf.version()));
let new_do =
MovieClip::new_with_avm2(movie, this, class_object, activation.context.gc_context);
this.init_display_object(activation.context.gc_context, new_do.into());
}
}
Ok(Value::Undefined)
}