Merge branch 'main' into sm-worker-package-fetch

Author: seanmorris

ChangeLog.md

@@ -20,6 +20,7 @@ See docs/process.md for more on how version tagging works.
 
 3.1.68 (in development)
 -----------------------
+- The freetype port was updated from v2.6 to v2.13.3. (#22585)
 
 3.1.67 - 09/17/24
 -----------------

src/library.js

@@ -1428,14 +1428,14 @@ addToLibrary({
 
   emscripten_random: () => Math.random(),
 
-  emscripten_get_now: `;
 #if PTHREADS && !AUDIO_WORKLET
-    // Pthreads need their clocks synchronized to the execution of the main
-    // thread, so, when using them, make sure to adjust all timings to the
-    // respective time origins.
-    _emscripten_get_now = () => performance.timeOrigin + {{{ getPerformanceNow() }}}();
+  // Pthreads need their clocks synchronized to the execution of the main
+  // thread, so, when using them, make sure to adjust all timings to the
+  // respective time origins.
+  emscripten_get_now: () => performance.timeOrigin + {{{ getPerformanceNow() }}}(),
 #else
 #if MIN_FIREFOX_VERSION <= 14 || MIN_CHROME_VERSION <= 23 || MIN_SAFARI_VERSION <= 80400 || AUDIO_WORKLET // https://caniuse.com/#feat=high-resolution-time
+  emscripten_get_now: `;
     // AudioWorkletGlobalScope does not have performance.now()
     // (https://github.com/WebAudio/web-audio-api/issues/2527), so if building
     // with
@@ -1449,14 +1449,14 @@ addToLibrary({
     } else {
       _emscripten_get_now = Date.now;
     }
+`,
 #else
-    // Modern environment where performance.now() is supported:
-    // N.B. a shorter form "_emscripten_get_now = performance.now;" is
-    // unfortunately not allowed even in current browsers (e.g. FF Nightly 75).
-    _emscripten_get_now = () => {{{ getPerformanceNow() }}}();
+  // Modern environment where performance.now() is supported:
+  // N.B. a shorter form "_emscripten_get_now = performance.now;" is
+  // unfortunately not allowed even in current browsers (e.g. FF Nightly 75).
+  emscripten_get_now: () => {{{ getPerformanceNow() }}}(),
 #endif
 #endif
-`,
 
   emscripten_get_now_res: () => { // return resolution of get_now, in nanoseconds
 #if ENVIRONMENT_MAY_BE_NODE

test/browser/test_sdl2_ttf.png

@@ -2191,18 +2191,16 @@ def run_browser(self, html_file, expected=None, message=None, timeout=None, extr
   def make_reftest(self, expected, manually_trigger=False):
     # make sure the pngs used here have no color correction, using e.g.
     #   pngcrush -rem gAMA -rem cHRM -rem iCCP -rem sRGB infile outfile
-    basename = os.path.basename(expected)
-    if os.path.abspath(os.path.dirname(expected)) != self.get_dir():
-      shutil.copyfile(expected, self.in_dir(basename))
     reporting = read_file(test_file('browser_reporting.js'))
+    shutil.copyfile(expected, 'expected.png')
     create_file('reftest.js', '''
       function doReftest() {
         if (doReftest.done) return;
         doReftest.done = true;
         var img = new Image();
-        img.onload = function() {
-          assert(img.width == Module.canvas.width, 'Invalid width: ' + Module.canvas.width + ', should be ' + img.width);
-          assert(img.height == Module.canvas.height, 'Invalid height: ' + Module.canvas.height + ', should be ' + img.height);
+        img.onload = () => {
+          assert(img.width == Module.canvas.width, `Invalid width: ${Module.canvas.width}, should be ${img.width}`);
+          assert(img.height == Module.canvas.height, `Invalid height: ${Module.canvas.height}, should be ${img.height}`);
 
           var canvas = document.createElement('canvas');
           canvas.width = img.width;
@@ -2213,7 +2211,7 @@ def make_reftest(self, expected, manually_trigger=False):
 
           var actualUrl = Module.canvas.toDataURL();
           var actualImage = new Image();
-          actualImage.onload = function() {
+          actualImage.onload = () => {
             /*
             document.body.appendChild(img); // for comparisons
             var div = document.createElement('div');
@@ -2242,7 +2240,7 @@ def make_reftest(self, expected, manually_trigger=False):
             var wrong = Math.floor(total / (img.width*img.height*3)); // floor, to allow some margin of error for antialiasing
             // If the main JS file is in a worker, or modularize, then we need to supply our own reporting logic.
             if (typeof reportResultToServer === 'undefined') {
-              (function() {
+              (() => {
                 %s
                 reportResultToServer(wrong);
               })();
@@ -2252,7 +2250,7 @@ def make_reftest(self, expected, manually_trigger=False):
           };
           actualImage.src = actualUrl;
         }
-        img.src = '%s';
+        img.src = 'expected.png';
       };
 
       /** @suppress {uselessCode} */
@@ -2267,16 +2265,16 @@ def make_reftest(self, expected, manually_trigger=False):
             // trigger reftest from RAF as well, needed for workers where there is no pre|postRun on the main thread
             var realRAF = window.requestAnimationFrame;
             /** @suppress{checkTypes} */
-            window.requestAnimationFrame = function(func) {
-              return realRAF(function() {
+            window.requestAnimationFrame = (func) => {
+              return realRAF(() => {
                 func();
                 realRAF(doReftest);
               });
             };
 
             // trigger reftest from canvas render too, for workers not doing GL
             var realWOM = worker.onmessage;
-            worker.onmessage = function(event) {
+            worker.onmessage = (event) => {
               realWOM(event);
               if (event.data.target === 'canvas' && event.data.op === 'render') {
                 realRAF(doReftest);
@@ -2290,14 +2288,12 @@ def make_reftest(self, expected, manually_trigger=False):
           // The user will call it.
           // Add an event loop iteration to ensure rendering, so users don't need to bother.
           var realDoReftest = doReftest;
-          doReftest = function() {
-            setTimeout(realDoReftest, 1);
-          };
+          doReftest = () => setTimeout(realDoReftest, 1);
         }
       }
 
       setupRefTest();
-''' % (reporting, basename, int(manually_trigger)))
+''' % (reporting, int(manually_trigger)))
 
   def compile_btest(self, filename, args, reporting=Reporting.FULL):
     # Inject support code for reporting results. This adds an include a header so testcases can

test/browser/test_sdl2_ttf_rtl.png

@@ -1 +1 @@
-8354
+8347

test/common.py

@@ -1 +1 @@
-20427
+20408

test/other/codesize/test_codesize_cxx_lto.gzsize

@@ -1 +1 @@
-4916
+4913

test/other/codesize/test_codesize_cxx_lto.jssize

@@ -1 +1 @@
-10465
+10458

test/other/codesize/test_codesize_minimal_pthreads.gzsize

@@ -3063,13 +3063,7 @@ def test_sdl2_canvas_write(self):
 
   @requires_graphics_hardware
   def test_sdl2_gl_frames_swap(self):
-    def post_build():
-      self.post_manual_reftest()
-      reftest = read_file('reftest.js')
-      reftest2 = reftest.replace("Module['postRun'] = doReftest;", '') # we don't want the very first frame
-      assert reftest != reftest2
-      create_file('reftest.js', reftest2)
-    self.reftest('test_sdl2_gl_frames_swap.c', 'test_sdl2_gl_frames_swap.png', args=['--proxy-to-worker', '-sGL_TESTING', '-sUSE_SDL=2'], manual_reference=True, post_build=post_build)
+    self.reftest('test_sdl2_gl_frames_swap.c', 'test_sdl2_gl_frames_swap.png', args=['--proxy-to-worker', '-sGL_TESTING', '-sUSE_SDL=2'], manual_reference=True, post_build=self.post_manual_reftest)
 
   @requires_graphics_hardware
   def test_sdl2_ttf(self):