Move preloadedAudios/preloadedImages inside Browser. NFC (#22855)

Author: sbc100

site/source/docs/api_reference/preamble.js.rst

@@ -389,8 +389,6 @@ The :ref:`emscripten-memory-model` uses a typed array buffer (``ArrayBuffer``) t
   function SAFE_HEAP_LOAD(dest, bytes, isFloat, unsigned)
   function SAFE_FT_MASK(value, mask)
   function CHECK_OVERFLOW(value, bits, ignore, sig)
-  Module["preloadedImages"]
-  Module["preloadedAudios"]
 
 
 .. PRIVATE NOTES (not rendered) :

src/library_browser.js

@@ -26,15 +26,16 @@ var LibraryBrowser = {
     Module["setCanvasSize"] = Browser.setCanvasSize;
     Module["getUserMedia"] = Browser.getUserMedia;
     Module["createContext"] = Browser.createContext;
-    var preloadedImages = {};
-    var preloadedAudios = {};`,
+  `,
 
   $Browser: {
     useWebGL: false,
     isFullscreen: false,
     pointerLock: false,
     moduleContextCreatedCallbacks: [],
     workers: [],
+    preloadedImages: {},
+    preloadedAudios: {},
 
     init() {
       if (Browser.initted) return;
@@ -73,7 +74,7 @@ var LibraryBrowser = {
           canvas.height = img.height;
           var ctx = canvas.getContext('2d');
           ctx.drawImage(img, 0, 0);
-          preloadedImages[name] = canvas;
+          Browser.preloadedImages[name] = canvas;
           URL.revokeObjectURL(url);
           onload?.(byteArray);
         };
@@ -94,13 +95,13 @@ var LibraryBrowser = {
         function finish(audio) {
           if (done) return;
           done = true;
-          preloadedAudios[name] = audio;
+          Browser.preloadedAudios[name] = audio;
           onload?.(byteArray);
         }
         function fail() {
           if (done) return;
           done = true;
-          preloadedAudios[name] = new Audio(); // empty shim
+          Browser.preloadedAudios[name] = new Audio(); // empty shim
           onerror?.();
         }
         var b = new Blob([byteArray], { type: Browser.getMimetype(name) });
@@ -881,7 +882,7 @@ var LibraryBrowser = {
   $getPreloadedImageData: (path, w, h) => {
     path = PATH_FS.resolve(path);
 
-    var canvas = /** @type {HTMLCanvasElement} */(preloadedImages[path]);
+    var canvas = /** @type {HTMLCanvasElement} */(Browser.preloadedImages[path]);
     if (!canvas) return 0;
 
     var ctx = canvas.getContext("2d");

src/library_sdl.js

@@ -2156,7 +2156,7 @@ var LibrarySDL = {
   // We support JPG, PNG, TIF because browsers do
   IMG_Init: (flags) => flags,
 
-  IMG_Load_RW__deps: ['SDL_LockSurface', 'SDL_FreeRW', '$PATH_FS', '$stackSave', '$stackRestore', '$stringToUTF8OnStack', '$stackAlloc'],
+  IMG_Load_RW__deps: ['$Browser', 'SDL_LockSurface', 'SDL_FreeRW', '$PATH_FS', '$stackSave', '$stackRestore', '$stringToUTF8OnStack', '$stackAlloc'],
   IMG_Load_RW__proxy: 'sync',
   IMG_Load_RW: (rwopsID, freeSrc) => {
     var sp = stackSave();
@@ -2209,7 +2209,7 @@ var LibrarySDL = {
 
       if (!raw) {
         filename = PATH_FS.resolve(filename);
-        raw = preloadedImages[filename];
+        raw = Browser.preloadedImages[filename];
         if (!raw) {
           if (raw === null) err('Trying to reuse preloaded image, but freePreloadedMediaOnUse is set!');
 #if STB_IMAGE
@@ -2222,7 +2222,7 @@ var LibrarySDL = {
           return 0;
 #endif
         } else if (Module['freePreloadedMediaOnUse']) {
-          preloadedImages[filename] = null;
+          Browser.preloadedImages[filename] = null;
         }
       }
 
@@ -2702,7 +2702,7 @@ var LibrarySDL = {
 
     if (rwops.filename !== undefined) {
       filename = PATH_FS.resolve(rwops.filename);
-      var raw = preloadedAudios[filename];
+      var raw = Browser.preloadedAudios[filename];
       if (!raw) {
         if (raw === null) err('Trying to reuse preloaded audio, but freePreloadedMediaOnUse is set!');
         if (!Module['noAudioDecoding']) warnOnce('Cannot find preloaded audio ' + filename);
@@ -2716,7 +2716,7 @@ var LibrarySDL = {
         }
       }
       if (Module['freePreloadedMediaOnUse']) {
-        preloadedAudios[filename] = null;
+        Browser.preloadedAudios[filename] = null;
       }
       audio = raw;
     }