Revert "Include OffscreenCanvas proxy logic only when necessary"

This reverts commit c9f172f.

Author: kleisauke

src/library_html5.js

@@ -2416,17 +2416,11 @@ var LibraryHTML5 = {
   },
 
 #if USE_PTHREADS
-  emscripten_set_canvas_element_size_calling_thread__deps: [
-    '$JSEvents',
-#if OFFSCREENCANVAS_SUPPORT
-    'emscripten_set_offscreencanvas_size_on_target_thread',
-#endif
-    '$findCanvasEventTarget'],
+  emscripten_set_canvas_element_size_calling_thread__deps: ['$JSEvents', 'emscripten_set_offscreencanvas_size_on_target_thread', '$findCanvasEventTarget'],
   emscripten_set_canvas_element_size_calling_thread: function(target, width, height) {
     var canvas = findCanvasEventTarget(target);
     if (!canvas) return {{{ cDefine('EMSCRIPTEN_RESULT_UNKNOWN_TARGET') }}};
 
-#if OFFSCREENCANVAS_SUPPORT
     if (canvas.canvasSharedPtr) {
       // N.B. We hold the canvasSharedPtr info structure as the authoritative source for specifying the size of a canvas
       // since the actual canvas size changes are asynchronous if the canvas is owned by an OffscreenCanvas on another thread.
@@ -2436,7 +2430,6 @@ var LibraryHTML5 = {
       {{{ makeSetValue('canvas.canvasSharedPtr', 0, 'width', 'i32') }}};
       {{{ makeSetValue('canvas.canvasSharedPtr', 4, 'height', 'i32') }}};
     }
-#endif
 
     if (canvas.offscreenCanvas || !canvas.controlTransferredOffscreen) {
       if (canvas.offscreenCanvas) canvas = canvas.offscreenCanvas;
@@ -2460,12 +2453,10 @@ var LibraryHTML5 = {
         // but this can be quite disruptive.
         canvas.GLctxObject.GLctx.viewport(0, 0, width, height);
       }
-#if OFFSCREENCANVAS_SUPPORT
     } else if (canvas.canvasSharedPtr) {
       var targetThread = {{{ makeGetValue('canvas.canvasSharedPtr', 8, 'i32') }}};
       _emscripten_set_offscreencanvas_size_on_target_thread(targetThread, target, width, height);
       return {{{ cDefine('EMSCRIPTEN_RESULT_DEFERRED') }}}; // This will have to be done asynchronously
-#endif
     } else {
 #if GL_DEBUG
       err('canvas.controlTransferredOffscreen but we do not own the canvas, and do not know who has (no canvas.canvasSharedPtr present, an internal bug?)!\n');
@@ -2478,7 +2469,6 @@ var LibraryHTML5 = {
     return {{{ cDefine('EMSCRIPTEN_RESULT_SUCCESS') }}};
   },
 
-#if OFFSCREENCANVAS_SUPPORT
   emscripten_set_offscreencanvas_size_on_target_thread_js__deps: ['$stringToNewUTF8', 'emscripten_dispatch_to_thread_', '$withStackSave'],
   emscripten_set_offscreencanvas_size_on_target_thread_js: function(targetThread, targetCanvas, width, height) {
     withStackSave(function() {
@@ -2503,7 +2493,6 @@ var LibraryHTML5 = {
     targetCanvas = targetCanvas ? UTF8ToString(targetCanvas) : '';
     _emscripten_set_offscreencanvas_size_on_target_thread_js(targetThread, targetCanvas, width, height);
   },
-#endif
 
   emscripten_set_canvas_element_size_main_thread__proxy: 'sync',
   emscripten_set_canvas_element_size_main_thread__sig: 'iiii',
@@ -2566,7 +2555,6 @@ var LibraryHTML5 = {
     var canvas = findCanvasEventTarget(target);
     if (!canvas) return {{{ cDefine('EMSCRIPTEN_RESULT_UNKNOWN_TARGET') }}};
 
-#if OFFSCREENCANVAS_SUPPORT
     if (canvas.canvasSharedPtr) {
       // N.B. Reading the size of the Canvas takes priority from our shared state structure, which is not the actual size.
       // However if is possible that there is a canvas size set event pending on an OffscreenCanvas owned by another thread,
@@ -2575,9 +2563,7 @@ var LibraryHTML5 = {
       var h = {{{ makeGetValue('canvas.canvasSharedPtr', 4, 'i32') }}};
       {{{ makeSetValue('width', 0, 'w', 'i32') }}};
       {{{ makeSetValue('height', 0, 'h', 'i32') }}};
-    } else
-#endif
-    if (canvas.offscreenCanvas) {
+    } else if (canvas.offscreenCanvas) {
       {{{ makeSetValue('width', 0, 'canvas.offscreenCanvas.width', 'i32') }}};
       {{{ makeSetValue('height', 0, 'canvas.offscreenCanvas.height', 'i32') }}};
     } else if (!canvas.controlTransferredOffscreen) {

system/include/emscripten/threading.h

@@ -11,7 +11,7 @@
 #include <pthread.h>
 #include <stdarg.h>
 
-#include <emscripten/html5.h>  // for EMSCRIPTEN_RESULT
+#include <emscripten/html5.h>
 #include <emscripten/atomic.h>
 
 #ifdef __cplusplus

system/lib/pthread/library_pthread.c

@@ -183,12 +183,10 @@ static void _do_call(void* arg) {
   // C function pointer
   assert(EM_FUNC_SIG_NUM_FUNC_ARGUMENTS(q->functionEnum) <= EM_QUEUED_CALL_MAX_ARGS);
   switch (q->functionEnum) {
-#ifdef __EMSCRIPTEN_OFFSCREEN_CANVAS__
     case EM_PROXIED_RESIZE_OFFSCREENCANVAS:
       q->returnValue.i =
         emscripten_set_canvas_element_size(q->args[0].cp, q->args[1].i, q->args[2].i);
       break;
-#endif
     case EM_PROXIED_JS_FUNCTION:
       q->returnValue.d =
         emscripten_receive_on_main_thread_js((int)(size_t)q->functionPtr, q->args[0].i, &q->args[1].d);

tests/other/metadce/minimal_main_Oz_USE_PTHREADS_PROXY_TO_PTHREAD.exports

@@ -3,7 +3,9 @@ B
 C
 D
 E
-n
+F
+G
+H
 o
 p
 q

tests/other/metadce/minimal_main_Oz_USE_PTHREADS_PROXY_TO_PTHREAD.funcs

@@ -36,6 +36,7 @@ $em_queued_call_free
 $em_queued_call_malloc
 $emscripten_async_run_in_main_thread
 $emscripten_current_thread_process_queued_calls
+$emscripten_dispatch_to_thread_
 $emscripten_futex_wait
 $emscripten_futex_wake
 $emscripten_main_thread_process_queued_calls

tests/other/metadce/minimal_main_Oz_USE_PTHREADS_PROXY_TO_PTHREAD.imports

@@ -11,3 +11,4 @@ a.j
 a.k
 a.l
 a.m
+a.n

tests/other/metadce/minimal_main_Oz_USE_PTHREADS_PROXY_TO_PTHREAD.jssize

@@ -1 +1 @@
-32193
+41444

tests/other/metadce/minimal_main_Oz_USE_PTHREADS_PROXY_TO_PTHREAD.sent

@@ -11,3 +11,4 @@ j
 k
 l
 m
+n

tests/other/metadce/minimal_main_Oz_USE_PTHREADS_PROXY_TO_PTHREAD.size

@@ -1 +1 @@
-17004
+17350

tests/test_other.py

@@ -11031,7 +11031,7 @@ def test_deps_info(self):
         cmd.append('-sMAIN_MODULE=2')
       if function.startswith('emscripten_idb') or function.startswith('emscripten_wget_'):
         cmd.append('-sASYNCIFY')
-      if function.startswith('emscripten_webgl_') or 'offscreencanvas' in function:
+      if function.startswith('emscripten_webgl_'):
         cmd.append('-sOFFSCREENCANVAS_SUPPORT')
       if function.startswith('wgpu'):
         cmd.append('-sUSE_WEBGPU')

tools/deps_info.py

@@ -107,6 +107,7 @@
   'emscripten_run_script_string': ['emscripten_builtin_malloc', 'emscripten_builtin_free'],
   'emscripten_set_batterychargingchange_callback_on_thread': ['malloc'],
   'emscripten_set_batterylevelchange_callback_on_thread': ['malloc'],
+  'emscripten_set_beforeunload_callback_on_thread': ['malloc'],
   'emscripten_set_blur_callback_on_thread': ['malloc'],
   'emscripten_set_click_callback_on_thread': ['malloc'],
   'emscripten_set_dblclick_callback_on_thread': ['malloc'],
@@ -128,8 +129,10 @@
   'emscripten_set_mouseout_callback_on_thread': ['malloc'],
   'emscripten_set_mouseover_callback_on_thread': ['malloc'],
   'emscripten_set_mouseup_callback_on_thread': ['malloc'],
+  'emscripten_set_offscreencanvas_size_on_target_thread_js': ['malloc'],
   'emscripten_set_orientationchange_callback_on_thread': ['malloc'],
   'emscripten_set_pointerlockchange_callback_on_thread': ['malloc'],
+  'emscripten_set_pointerlockerror_callback_on_thread': ['malloc'],
   'emscripten_set_resize_callback_on_thread': ['malloc'],
   'emscripten_set_scroll_callback_on_thread': ['malloc'],
   'emscripten_set_touchcancel_callback_on_thread': ['malloc'],
@@ -167,7 +170,7 @@
   'localtime': ['malloc'],
   'localtime_r': ['malloc'],
   'mktime': ['malloc'],
-  'pthread_create': ['emscripten_main_thread_process_queued_calls'],
+  'pthread_create': ['malloc', 'emscripten_main_thread_process_queued_calls'],
   'recv': ['htons'],
   'recvmsg': ['htons'],
   'accept': ['htons'],
@@ -213,9 +216,7 @@ def get_deps_info():
     # When OFFSCREEN_FRAMEBUFFER is defined these functions are defined in native code,
     # otherwise they are defined in src/library_html5_webgl.js.
     _deps_info['emscripten_webgl_destroy_context'] = ['emscripten_webgl_make_context_current', 'emscripten_webgl_get_current_context']
-  if settings.USE_PTHREADS and settings.OFFSCREENCANVAS_SUPPORT:
-    _deps_info['emscripten_set_offscreencanvas_size_on_target_thread'] = ['emscripten_dispatch_to_thread_', 'malloc', 'free']
-    _deps_info['emscripten_set_offscreencanvas_size_on_target_thread_js'] = ['malloc']
   if settings.USE_PTHREADS:
     _deps_info['emscripten_set_canvas_element_size_calling_thread'] = ['emscripten_dispatch_to_thread_']
+    _deps_info['emscripten_set_offscreencanvas_size_on_target_thread'] = ['emscripten_dispatch_to_thread_', 'malloc', 'free']
   return _deps_info

tools/system_libs.py

@@ -682,32 +682,6 @@ def get_default_variation(cls, **kwargs):
     return super().get_default_variation(is_asan=settings.USE_ASAN, **kwargs)
 
 
-class OffscreenCanvasSupportLibrary(Library):
-  def __init__(self, **kwargs):
-    self.is_ofc = kwargs.pop('is_ofc', False)
-    super().__init__(**kwargs)
-
-  def get_cflags(self):
-    cflags = super().get_cflags()
-    if self.is_ofc:
-      cflags += ['-D__EMSCRIPTEN_OFFSCREEN_CANVAS__']
-    return cflags
-
-  def get_base_name(self):
-    name = super().get_base_name()
-    if self.is_ofc:
-      name += '-ofc'
-    return name
-
-  @classmethod
-  def vary_on(cls):
-    return super().vary_on() + ['is_ofc']
-
-  @classmethod
-  def get_default_variation(cls, **kwargs):
-    return super().get_default_variation(is_ofc=settings.OFFSCREENCANVAS_SUPPORT, **kwargs)
-
-
 # Subclass of SjLjLibrary because emscripten_setjmp.c uses SjLj support
 class libcompiler_rt(MTLibrary, SjLjLibrary):
   name = 'libcompiler_rt'
@@ -739,7 +713,6 @@ class libc(MuslInternalLibrary,
            DebugLibrary,
            OptimizedAggressivelyForSizeLibrary,
            AsanInstrumentedLibrary,
-           OffscreenCanvasSupportLibrary,
            MTLibrary):
   name = 'libc'