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 unnecessary execution list accesses and debugging statements from `DisplayObjectContainer`.

This commit is contained in:
David Wendt 2020-11-03 18:04:36 -05:00 committed by Mike Welsh
parent bcef9ef415
commit 1f2c194ffd
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
core/src/avm2/globals/flash/display/displayobjectcontainer.rs
View File

@ -58,16 +58,16 @@ fn validate_add_operation<'gc>(
checking_parent = tp.parent(); checking_parent = tp.parent();
} }
if proposed_index > mc.children().count() { if proposed_index > mc.num_children() {
return Err("RangeError: Index position does not exist in the child list".into()); return Err("RangeError: Index position does not exist in the child list".into());
} }
Ok(()) Ok(())
} }
/// Validate if we can add remove a child from a given parent. /// Validate if we can remove a child from a given parent.
/// ///
/// There are several conditions which should cause an add operation to fail: /// There are several conditions which should cause a remove operation to fail:
/// ///
/// * The child is not a child of the parent /// * The child is not a child of the parent
fn validate_remove_operation<'gc>( fn validate_remove_operation<'gc>(
@ -101,7 +101,6 @@ fn remove_child_from_displaylist<'gc>(
if let Some(parent) = child.parent() { if let Some(parent) = child.parent() {
if let Some(mut mc) = parent.as_movie_clip() { if let Some(mut mc) = parent.as_movie_clip() {
mc.remove_child_from_avm(context, child); mc.remove_child_from_avm(context, child);
mc.children();
} }
} }
} }
@ -124,7 +123,6 @@ fn add_child_to_displaylist<'gc>(
if let Some(mut mc) = parent.as_movie_clip() { if let Some(mut mc) = parent.as_movie_clip() {
mc.add_child_from_avm_by_id(context, child, index); mc.add_child_from_avm_by_id(context, child, index);
child.set_placed_by_script(context.gc_context, true); child.set_placed_by_script(context.gc_context, true);
mc.children();
} }
} }
@ -265,8 +263,11 @@ pub fn num_children<'gc>(
this: Option<Object<'gc>>, this: Option<Object<'gc>>,
_args: &[Value<'gc>], _args: &[Value<'gc>],
) -> Result<Value<'gc>, Error> { ) -> Result<Value<'gc>, Error> {
if let Some(parent) = this.and_then(|this| this.as_display_object()) { if let Some(parent) = this
return Ok(parent.children().count().into()); .and_then(|this| this.as_display_object())
.and_then(|this| this.as_movie_clip())
{
return Ok(parent.num_children().into());
} }
Ok(Value::Undefined) Ok(Value::Undefined)