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

avm1: Migrate Object to proto_value

This commit is contained in:
relrelb 2021-04-01 10:33:22 +03:00 committed by kmeisthax
parent e712a4fd59
commit 76d80061a7
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
core/src/avm1/object.rs
View File

@ -113,7 +113,11 @@ pub trait TObject<'gc>: 'gc + Collect + Debug + Into<Object<'gc>> + Clone + Copy
if self.has_own_property(activation, name) { if self.has_own_property(activation, name) {
self.get_local(name, activation, (*self).into()) self.get_local(name, activation, (*self).into())
} else { } else {
Ok(search_prototype(self.proto(), name, activation, (*self).into())?.0) let prototype = match self.proto_value() {
Value::Object(o) => Some(o),
_ => None,
};
Ok(search_prototype(prototype, name, activation, (*self).into())?.0)
} }
} }
@ -398,7 +402,7 @@ pub trait TObject<'gc>: 'gc + Collect + Debug + Into<Object<'gc>> + Clone + Copy
prototype: Object<'gc>, prototype: Object<'gc>,
) -> Result<bool, Error<'gc>> { ) -> Result<bool, Error<'gc>> {
let mut proto_stack = vec![]; let mut proto_stack = vec![];
if let Some(p) = self.proto() { if let Value::Object(p) = self.proto_value() {
proto_stack.push(p); proto_stack.push(p);
} }
@ -407,7 +411,7 @@ pub trait TObject<'gc>: 'gc + Collect + Debug + Into<Object<'gc>> + Clone + Copy
return Ok(true); return Ok(true);
} }
if let Some(p) = this_proto.proto() { if let Value::Object(p) = this_proto.proto_value() {
proto_stack.push(p); proto_stack.push(p);
} }
@ -539,14 +543,14 @@ pub trait TObject<'gc>: 'gc + Collect + Debug + Into<Object<'gc>> + Clone + Copy
/// Check if this object is in the prototype chain of the specified test object. /// Check if this object is in the prototype chain of the specified test object.
fn is_prototype_of(&self, other: Object<'gc>) -> bool { fn is_prototype_of(&self, other: Object<'gc>) -> bool {
let mut proto = other.proto(); let mut proto = other.proto_value();
while let Some(proto_ob) = proto { while let Value::Object(proto_ob) = proto {
if self.as_ptr() == proto_ob.as_ptr() { if self.as_ptr() == proto_ob.as_ptr() {
return true; return true;
} }
proto = proto_ob.proto(); proto = proto_ob.proto_value();
} }
false false
@ -605,23 +609,24 @@ impl<'gc> Object<'gc> {
/// The second return value can and should be used to populate the `base_proto` /// The second return value can and should be used to populate the `base_proto`
/// property necessary to make `super` work. /// property necessary to make `super` work.
pub fn search_prototype<'gc>( pub fn search_prototype<'gc>(
mut proto: Option<Object<'gc>>, proto: Option<Object<'gc>>,
name: &str, name: &str,
activation: &mut Activation<'_, 'gc, '_>, activation: &mut Activation<'_, 'gc, '_>,
this: Object<'gc>, this: Object<'gc>,
) -> Result<(Value<'gc>, Option<Object<'gc>>), Error<'gc>> { ) -> Result<(Value<'gc>, Option<Object<'gc>>), Error<'gc>> {
let mut proto = proto.map_or(Value::Undefined, Value::Object);
let mut depth = 0; let mut depth = 0;
while proto.is_some() { while let Value::Object(p) = proto {
if depth == 255 { if depth == 255 {
return Err(Error::PrototypeRecursionLimit); return Err(Error::PrototypeRecursionLimit);
} }
if proto.unwrap().has_own_property(activation, name) { if p.has_own_property(activation, name) {
return Ok((proto.unwrap().get_local(name, activation, this)?, proto)); return Ok((p.get_local(name, activation, this)?, Some(p)));
} }
proto = proto.unwrap().proto(); proto = p.proto_value();
depth += 1; depth += 1;
} }