avm2: Use Value as receiver in all native functions instead of Object

ruffle-rs · Dec 16, 2024 · 226fee2 · 226fee2
1 parent 8b9cb46
commit 226fee2
Show file tree

Hide file tree

Showing 99 changed files with 2,634 additions and 1,069 deletions.
diff --git a/core/src/avm2.rs b/core/src/avm2.rs
@@ -311,7 +311,7 @@ impl<'gc> Avm2<'gc> {
                     .context
                     .avm2
                     .push_global_init(init_activation.context.gc_context, script);
-                let r = (method.method)(&mut init_activation, scope, &[]);
+                let r = (method.method)(&mut init_activation, Value::Object(scope), &[]);
                 init_activation
                     .context
                     .avm2

diff --git a/core/src/avm2/function.rs b/core/src/avm2/function.rs
@@ -200,7 +200,7 @@ pub fn exec<'gc>(
                 .context
                 .avm2
                 .push_call(activation.context.gc_context, method, bound_class);
-            (bm.method)(&mut activation, receiver, &arguments)
+            (bm.method)(&mut activation, Value::Object(receiver), &arguments)
         }
         Method::Bytecode(bm) => {
             if bm.is_unchecked() {

diff --git a/core/src/avm2/globals/__ruffle__.rs b/core/src/avm2/globals/__ruffle__.rs
@@ -1,14 +1,13 @@
 use crate::avm2::activation::Activation;
 use crate::avm2::error::Error;
-use crate::avm2::object::Object;
 use crate::avm2::value::Value;
 use crate::string::WStr;
 use crate::stub::Stub;
 use std::borrow::Cow;
 
 pub fn stub_method<'gc>(
     activation: &mut Activation<'_, 'gc>,
-    _this: Object<'gc>,
+    _this: Value<'gc>,
     args: &[Value<'gc>],
 ) -> Result<Value<'gc>, Error<'gc>> {
     match args {
@@ -45,7 +44,7 @@ pub fn stub_method<'gc>(
 
 pub fn stub_getter<'gc>(
     activation: &mut Activation<'_, 'gc>,
-    _this: Object<'gc>,
+    _this: Value<'gc>,
     args: &[Value<'gc>],
 ) -> Result<Value<'gc>, Error<'gc>> {
     match args {
@@ -68,7 +67,7 @@ pub fn stub_getter<'gc>(
 
 pub fn stub_setter<'gc>(
     activation: &mut Activation<'_, 'gc>,
-    _this: Object<'gc>,
+    _this: Value<'gc>,
     args: &[Value<'gc>],
 ) -> Result<Value<'gc>, Error<'gc>> {
     match args {
@@ -91,7 +90,7 @@ pub fn stub_setter<'gc>(
 
 pub fn stub_constructor<'gc>(
     activation: &mut Activation<'_, 'gc>,
-    _this: Object<'gc>,
+    _this: Value<'gc>,
     args: &[Value<'gc>],
 ) -> Result<Value<'gc>, Error<'gc>> {
     match args {
@@ -124,7 +123,7 @@ pub fn stub_constructor<'gc>(
 
 pub fn log_warn<'gc>(
     activation: &mut Activation<'_, 'gc>,
-    _this: Object<'gc>,
+    _this: Value<'gc>,
     args: &[Value<'gc>],
 ) -> Result<Value<'gc>, Error<'gc>> {
     match args {