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: Lazily initialize Graphics object 

Initialize a Sprite/Shape's Graphics object on the first access,
so that `shape.graphics == shape.graphics` is `true`.
This commit is contained in:
Mike Welsh 2021-03-24 12:13:19 -07:00
parent 040da925e4
commit f96a414036
2 changed files with 69 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
core/src/avm2/globals/flash/display/shape.rs
View File

@ -2,6 +2,7 @@
use crate::avm2::activation::Activation;
use crate::avm2::class::Class;
use crate::avm2::globals::NS_RUFFLE_INTERNAL;
use crate::avm2::method::Method;
use crate::avm2::names::{Namespace, QName};
use crate::avm2::object::{Object, StageObject, TObject};
@ -52,15 +53,33 @@ pub fn graphics<'gc>(
this: Option<Object<'gc>>,
_args: &[Value<'gc>],
) -> Result<Value<'gc>, Error> {
if let Some(dobj) = this.and_then(|o| o.as_display_object()) {
let graphics_proto = activation.context.avm2.prototypes().graphics;
return Ok(StageObject::for_display_object(
activation.context.gc_context,
dobj,
graphics_proto,
)
.into());
if let Some(mut this) = this {
if let Some(dobj) = this.as_display_object() {
// Lazily initialize the `Graphics` object in a hidden property.
let graphics = match this.get_property(
this,
&QName::new(Namespace::private(NS_RUFFLE_INTERNAL), "graphics"),
activation,
)? {
Value::Undefined | Value::Null => {
let graphics_proto = activation.context.avm2.prototypes().graphics;
let graphics = Value::from(StageObject::for_display_object(
activation.context.gc_context,
dobj,
graphics_proto,
));
this.set_property(
this,
&QName::new(Namespace::private(NS_RUFFLE_INTERNAL), "graphics"),
graphics.clone(),
activation,
)?;
graphics
}
graphics => graphics,
};
return Ok(graphics);
}
}
Ok(Value::Undefined)
@ -83,5 +102,12 @@ pub fn create_class<'gc>(mc: MutationContext<'gc, '_>) -> GcCell<'gc, Class<'gc>
Method::from_builtin(graphics),
));
// Slot for lazy-initialized Graphics object.
write.define_instance_trait(Trait::from_slot(
QName::new(Namespace::private(NS_RUFFLE_INTERNAL), "graphics"),
QName::new(Namespace::package("flash.display"), "Graphics").into(),
None,
));
class
}

43
core/src/avm2/globals/flash/display/sprite.rs
View File

@ -2,6 +2,7 @@
use crate::avm2::activation::Activation;
use crate::avm2::class::{Class, ClassAttributes};
use crate::avm2::globals::NS_RUFFLE_INTERNAL;
use crate::avm2::method::Method;
use crate::avm2::names::{Namespace, QName};
use crate::avm2::object::{Object, StageObject, TObject};
@ -38,15 +39,33 @@ pub fn graphics<'gc>(
this: Option<Object<'gc>>,
_args: &[Value<'gc>],
) -> Result<Value<'gc>, Error> {
if let Some(dobj) = this.and_then(|o| o.as_display_object()) {
let graphics_proto = activation.context.avm2.prototypes().graphics;
return Ok(StageObject::for_display_object(
activation.context.gc_context,
dobj,
graphics_proto,
)
.into());
if let Some(mut this) = this {
if let Some(dobj) = this.as_display_object() {
// Lazily initialize the `Graphics` object in a hidden property.
let graphics = match this.get_property(
this,
&QName::new(Namespace::private(NS_RUFFLE_INTERNAL), "graphics"),
activation,
)? {
Value::Undefined | Value::Null => {
let graphics_proto = activation.context.avm2.prototypes().graphics;
let graphics = Value::from(StageObject::for_display_object(
activation.context.gc_context,
dobj,
graphics_proto,
));
this.set_property(
this,
&QName::new(Namespace::private(NS_RUFFLE_INTERNAL), "graphics"),
graphics.clone(),
activation,
)?;
graphics
}
graphics => graphics,
};
return Ok(graphics);
}
}
Ok(Value::Undefined)
@ -77,5 +96,11 @@ pub fn create_class<'gc>(mc: MutationContext<'gc, '_>) -> GcCell<'gc, Class<'gc>
Method::from_builtin(graphics),
));
write.define_instance_trait(Trait::from_slot(
QName::new(Namespace::private(NS_RUFFLE_INTERNAL), "graphics"),
QName::new(Namespace::package("flash.display"), "Graphics").into(),
None,
));
class
}