Skip to content

Commit 6f793af

Browse files
authored
Use JS names for functions that are JS-only. NFC (#18958)
As JS_only functions there can never appear in native code so also have no effect it deps_info.py.
1 parent 7e5ab40 commit 6f793af

File tree

2 files changed

+16
-23
lines changed

2 files changed

+16
-23
lines changed

src/library_html5.js

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2385,13 +2385,13 @@ var LibraryHTML5 = {
23852385
},
23862386

23872387
#if PTHREADS
2388-
emscripten_set_canvas_element_size_calling_thread__deps: [
2388+
$setCanvasElementSizeCallingThread__deps: [
23892389
'$JSEvents',
23902390
#if OFFSCREENCANVAS_SUPPORT
2391-
'emscripten_set_offscreencanvas_size_on_target_thread',
2391+
'$setOffscreenCanvasSizeOnTargetThread',
23922392
#endif
23932393
'$findCanvasEventTarget'],
2394-
emscripten_set_canvas_element_size_calling_thread: function(target, width, height) {
2394+
$setCanvasElementSizeCallingThread: function(target, width, height) {
23952395
var canvas = findCanvasEventTarget(target);
23962396
if (!canvas) return {{{ cDefs.EMSCRIPTEN_RESULT_UNKNOWN_TARGET }}};
23972397

@@ -2434,7 +2434,7 @@ var LibraryHTML5 = {
24342434
#if OFFSCREENCANVAS_SUPPORT
24352435
} else if (canvas.canvasSharedPtr) {
24362436
var targetThread = {{{ makeGetValue('canvas.canvasSharedPtr', 8, 'i32') }}};
2437-
_emscripten_set_offscreencanvas_size_on_target_thread(targetThread, target, width, height);
2437+
setOffscreenCanvasSizeOnTargetThread(targetThread, target, width, height);
24382438
return {{{ cDefs.EMSCRIPTEN_RESULT_DEFERRED }}}; // This will have to be done asynchronously
24392439
#endif
24402440
} else {
@@ -2453,8 +2453,9 @@ var LibraryHTML5 = {
24532453
#if OFFSCREENCANVAS_SUPPORT
24542454
_emscripten_set_offscreencanvas_size: 'emscripten_set_canvas_element_size',
24552455

2456-
emscripten_set_offscreencanvas_size_on_target_thread_js__deps: ['$stringToNewUTF8', 'emscripten_dispatch_to_thread_', '$withStackSave'],
2457-
emscripten_set_offscreencanvas_size_on_target_thread_js: function(targetThread, targetCanvas, width, height) {
2456+
$setOffscreenCanvasSizeOnTargetThread__deps: ['$stringToNewUTF8', 'emscripten_dispatch_to_thread_', '$withStackSave'],
2457+
$setOffscreenCanvasSizeOnTargetThread: function(targetThread, targetCanvas, width, height) {
2458+
targetCanvas = targetCanvas ? UTF8ToString(targetCanvas) : '';
24582459
withStackSave(function() {
24592460
var varargs = stackAlloc(12);
24602461
var targetCanvasPtr = 0;
@@ -2471,12 +2472,6 @@ var LibraryHTML5 = {
24712472
_emscripten_dispatch_to_thread_(targetThread, {{{ cDefs.EM_PROXIED_RESIZE_OFFSCREENCANVAS }}}, 0, targetCanvasPtr /* satellite data */, varargs);
24722473
});
24732474
},
2474-
2475-
emscripten_set_offscreencanvas_size_on_target_thread__deps: ['emscripten_set_offscreencanvas_size_on_target_thread_js'],
2476-
emscripten_set_offscreencanvas_size_on_target_thread: function(targetThread, targetCanvas, width, height) {
2477-
targetCanvas = targetCanvas ? UTF8ToString(targetCanvas) : '';
2478-
_emscripten_set_offscreencanvas_size_on_target_thread_js(targetThread, targetCanvas, width, height);
2479-
},
24802475
#else
24812476
_emscripten_set_offscreencanvas_size: function(target, width, height) {
24822477
#if ASSERTIONS
@@ -2486,22 +2481,24 @@ var LibraryHTML5 = {
24862481
},
24872482
#endif
24882483

2489-
emscripten_set_canvas_element_size_main_thread__proxy: 'sync',
2490-
emscripten_set_canvas_element_size_main_thread__sig: 'iiii',
2491-
emscripten_set_canvas_element_size_main_thread__deps: ['emscripten_set_canvas_element_size_calling_thread'],
2492-
emscripten_set_canvas_element_size_main_thread: function(target, width, height) { return _emscripten_set_canvas_element_size_calling_thread(target, width, height); },
2484+
$setCanvasElementSizeMainThread__proxy: 'sync',
2485+
$setCanvasElementSizeMainThread__sig: 'iiii',
2486+
$setCanvasElementSizeMainThread__deps: ['$setCanvasElementSizeCallingThread'],
2487+
$setCanvasElementSizeMainThread: function(target, width, height) {
2488+
return setCanvasElementSizeCallingThread(target, width, height);
2489+
},
24932490

2494-
emscripten_set_canvas_element_size__deps: ['$JSEvents', 'emscripten_set_canvas_element_size_calling_thread', 'emscripten_set_canvas_element_size_main_thread', '$findCanvasEventTarget'],
2491+
emscripten_set_canvas_element_size__deps: ['$JSEvents', '$setCanvasElementSizeCallingThread', '$setCanvasElementSizeMainThread', '$findCanvasEventTarget'],
24952492
emscripten_set_canvas_element_size__sig: 'ipii',
24962493
emscripten_set_canvas_element_size: function(target, width, height) {
24972494
#if GL_DEBUG
24982495
dbg('emscripten_set_canvas_element_size(target='+target+',width='+width+',height='+height);
24992496
#endif
25002497
var canvas = findCanvasEventTarget(target);
25012498
if (canvas) {
2502-
return _emscripten_set_canvas_element_size_calling_thread(target, width, height);
2499+
return setCanvasElementSizeCallingThread(target, width, height);
25032500
}
2504-
return _emscripten_set_canvas_element_size_main_thread(target, width, height);
2501+
return setCanvasElementSizeMainThread(target, width, height);
25052502
},
25062503
#else
25072504
emscripten_set_canvas_element_size__deps: ['$JSEvents', '$findCanvasEventTarget'],

tools/deps_info.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -205,13 +205,9 @@ def get_deps_info():
205205
_deps_info['glutCreateWindow'] = ['malloc']
206206
_deps_info['emscripten_webgl_create_context'] = ['malloc']
207207
_deps_info['emscripten_webgl_destroy_context'] = ['free']
208-
_deps_info['emscripten_set_canvas_element_size_calling_thread'] = ['emscripten_dispatch_to_thread_']
209208
if settings.OFFSCREEN_FRAMEBUFFER:
210209
# When OFFSCREEN_FRAMEBUFFER is defined these functions are defined in native code,
211210
# otherwise they are defined in src/library_html5_webgl.js.
212211
_deps_info['emscripten_webgl_destroy_context'] += ['emscripten_webgl_make_context_current', 'emscripten_webgl_get_current_context']
213-
if settings.OFFSCREENCANVAS_SUPPORT:
214-
_deps_info['emscripten_set_offscreencanvas_size_on_target_thread'] = ['emscripten_dispatch_to_thread_', 'malloc', 'free']
215-
_deps_info['emscripten_set_offscreencanvas_size_on_target_thread_js'] = ['malloc']
216212

217213
return _deps_info

0 commit comments

Comments
 (0)