core: Add new context parameter to loader

Author: Bale001

core/src/avm1/activation.rs

@@ -1142,6 +1142,7 @@ impl<'a, 'gc, 'gc_context> Activation<'a, 'gc, 'gc_context> {
                             Request::get(url),
                             None,
                             None,
+                            None,
                         );
                         self.context.navigator.spawn_future(future);
                     }
@@ -1262,6 +1263,7 @@ impl<'a, 'gc, 'gc_context> Activation<'a, 'gc, 'gc_context> {
                         request,
                         None,
                         None,
+                        None,
                     );
                     self.context.navigator.spawn_future(future);
                 }
@@ -1282,6 +1284,7 @@ impl<'a, 'gc, 'gc_context> Activation<'a, 'gc, 'gc_context> {
                         Request::get(url.to_utf8_lossy().into_owned()),
                         None,
                         None,
+                        None,
                     );
                     self.context.navigator.spawn_future(future);
                 }

core/src/avm1/globals/movie_clip.rs

@@ -1341,6 +1341,7 @@ fn load_movie<'gc>(
         request,
         None,
         None,
+        None,
     );
     activation.context.navigator.spawn_future(future);
 

core/src/avm1/globals/movie_clip_loader.rs

@@ -65,6 +65,7 @@ fn load_clip<'gc>(
                     Request::get(url.to_utf8_lossy().into_owned()),
                     None,
                     Some(MovieLoaderEventHandler::Avm1Broadcast(this)),
+                    None,
                 );
                 activation.context.navigator.spawn_future(future);
 

core/src/avm2/globals/flash/display/loader.rs

@@ -52,15 +52,10 @@ pub fn load<'gc>(
 ) -> Result<Value<'gc>, Error<'gc>> {
     if let Some(this) = this {
         let url_request = args[0].as_object().unwrap();
+        let context = args
+            .get(1)
+            .and_then(|v| v.coerce_to_object(activation).ok());
 
-        if let Some(context) = args.get(1) {
-            if !matches!(context, Value::Null) {
-                log::warn!(
-                    "Loader.load: 'context' argument is not yet implemented: {:?}",
-                    context
-                );
-            }
-        }
         let url = url_request
             .get_property(&Multiname::public("url"), activation)?
             .coerce_to_string(activation)?;
@@ -86,6 +81,7 @@ pub fn load<'gc>(
             Request::get(url.to_string()),
             Some(url.to_string()),
             Some(MovieLoaderEventHandler::Avm2LoaderInfo(loader_info)),
+            context,
         );
         activation.context.navigator.spawn_future(future);
     }
@@ -100,15 +96,9 @@ pub fn load_bytes<'gc>(
     if let Some(this) = this {
         let arg0 = args[0].as_object().unwrap();
         let bytearray = arg0.as_bytearray().unwrap();
-
-        if let Some(context) = args.get(1) {
-            if !matches!(context, Value::Null) {
-                log::warn!(
-                    "Loader.load: 'context' argument is not yet implemented: {:?}",
-                    context
-                );
-            }
-        }
+        let context = args
+            .get(1)
+            .and_then(|v| v.coerce_to_object(activation).ok());
 
         // This is a dummy MovieClip, which will get overwritten in `Loader`
         let content = MovieClip::new(
@@ -129,6 +119,7 @@ pub fn load_bytes<'gc>(
             content.into(),
             bytearray.bytes().to_vec(),
             Some(MovieLoaderEventHandler::Avm2LoaderInfo(loader_info)),
+            context,
         );
         activation.context.navigator.spawn_future(future);
     }

core/src/loader.rs

@@ -271,13 +271,15 @@ impl<'gc> LoadManager<'gc> {
         request: Request,
         loader_url: Option<String>,
         event_handler: Option<MovieLoaderEventHandler<'gc>>,
+        context: Option<Avm2Object<'gc>>,
     ) -> OwnedFuture<(), Error> {
         let loader = Loader::Movie {
             self_handle: None,
             target_clip,
             event_handler,
             loader_status: LoaderStatus::Pending,
             movie: None,
+            context,
         };
         let handle = self.add_loader(loader);
         let loader = self.get_loader_mut(handle).unwrap();
@@ -293,13 +295,15 @@ impl<'gc> LoadManager<'gc> {
         target_clip: DisplayObject<'gc>,
         bytes: Vec<u8>,
         event_handler: Option<MovieLoaderEventHandler<'gc>>,
+        context: Option<Avm2Object<'gc>>,
     ) -> OwnedFuture<(), Error> {
         let loader = Loader::Movie {
             self_handle: None,
             target_clip,
             event_handler,
             loader_status: LoaderStatus::Pending,
             movie: None,
+            context,
         };
         let handle = self.add_loader(loader);
         let loader = self.get_loader_mut(handle).unwrap();
@@ -511,6 +515,9 @@ pub enum Loader<'gc> {
         /// completed and we expect the Player to periodically tick preload
         /// until loading completes.
         movie: Option<Arc<SwfMovie>>,
+
+        /// The context of the SWF being loaded. (AVM2 only)
+        context: Option<Avm2Object<'gc>>,
     },
 
     /// Loader that is loading form data into an AVM1 object scope.