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

core: Use the library's AVM type to determine how to name the root. 

We cannot check it's constructed AVM value anymore because it is now named before construction.
This commit is contained in:
David Wendt 2021-04-08 21:23:45 -04:00 committed by Mike Welsh
parent ebc5c3dd64
commit 27d09084fb
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/display_object.rs
View File

@ -1262,9 +1262,14 @@ pub trait TDisplayObject<'gc>:
/// The default root names change based on the AVM configuration of the
/// clip; AVM2 clips get `rootN` while AVM1 clips get blank strings.
fn set_default_root_name(&self, context: &mut UpdateContext<'_, 'gc, '_>) {
if !matches!(self.object2(), Avm2Value::Undefined) {
let movie = self
.movie()
.expect("All roots should have an associated movie");
let vm_type = context.library.library_for_movie_mut(movie).avm_type();
if matches!(vm_type, AvmType::Avm2) {
self.set_name(context.gc_context, &format!("root{}", self.depth() + 1));
} else if !matches!(self.object(), Avm1Value::Undefined) {
} else if matches!(vm_type, AvmType::Avm1) {
self.set_name(context.gc_context, "");
}
}