Skip to content

Commit 2f604a4

Browse files
committed
Remove unused $JSEvents dependencies. NFC
1 parent fff72f8 commit 2f604a4

File tree

2 files changed

+14
-18
lines changed

2 files changed

+14
-18
lines changed

src/lib/libhtml5.js

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,7 @@ var LibraryHTML5 = {
430430
// eventStruct: the structure to populate.
431431
// e: The JS mouse event to read data from.
432432
// target: Specifies a target DOM element that will be used as the reference to populate targetX and targetY parameters.
433-
$fillMouseEventData__deps: ['$JSEvents', '$getBoundingClientRect', '$specialHTMLTargets'],
433+
$fillMouseEventData__deps: ['$getBoundingClientRect', '$specialHTMLTargets'],
434434
$fillMouseEventData: (eventStruct, e, target) => {
435435
#if ASSERTIONS
436436
assert(eventStruct % 4 == 0);
@@ -608,7 +608,7 @@ var LibraryHTML5 = {
608608
},
609609

610610
emscripten_set_wheel_callback_on_thread__proxy: 'sync',
611-
emscripten_set_wheel_callback_on_thread__deps: ['$JSEvents', '$registerWheelEventCallback', '$findEventTarget'],
611+
emscripten_set_wheel_callback_on_thread__deps: ['$registerWheelEventCallback', '$findEventTarget'],
612612
emscripten_set_wheel_callback_on_thread: (target, userData, useCapture, callbackfunc, targetThread) => {
613613
target = findEventTarget(target);
614614
if (!target) return {{{ cDefs.EMSCRIPTEN_RESULT_UNKNOWN_TARGET }}};
@@ -747,7 +747,6 @@ var LibraryHTML5 = {
747747
emscripten_set_focusout_callback_on_thread: (target, userData, useCapture, callbackfunc, targetThread) =>
748748
registerFocusEventCallback(target, userData, useCapture, callbackfunc, {{{ cDefs.EMSCRIPTEN_EVENT_FOCUSOUT }}}, "focusout", targetThread),
749749

750-
$fillDeviceOrientationEventData__deps: ['$JSEvents'],
751750
$fillDeviceOrientationEventData: (eventStruct, e, target) => {
752751
{{{ makeSetValue('eventStruct', C_STRUCTS.EmscriptenDeviceOrientationEvent.alpha, 'e.alpha', 'double') }}};
753752
{{{ makeSetValue('eventStruct', C_STRUCTS.EmscriptenDeviceOrientationEvent.beta, 'e.beta', 'double') }}};
@@ -802,7 +801,6 @@ var LibraryHTML5 = {
802801
return {{{ cDefs.EMSCRIPTEN_RESULT_SUCCESS }}};
803802
},
804803

805-
$fillDeviceMotionEventData__deps: ['$JSEvents'],
806804
$fillDeviceMotionEventData: (eventStruct, e, target) => {
807805
var supportedFields = 0;
808806
var a = e['acceleration'];
@@ -1178,7 +1176,7 @@ var LibraryHTML5 = {
11781176
return restoreOldStyle;
11791177
},
11801178

1181-
$registerRestoreOldStyle__deps: ['$JSEvents', '$getCanvasElementSize', '$setCanvasElementSize'],
1179+
$registerRestoreOldStyle__deps: ['$getCanvasElementSize', '$setCanvasElementSize'],
11821180
$registerRestoreOldStyle: (canvas) => {
11831181
var canvasSize = getCanvasElementSize(canvas);
11841182
var oldWidth = canvasSize[0];
@@ -1297,7 +1295,6 @@ var LibraryHTML5 = {
12971295
},
12981296

12991297
// Add letterboxes to a fullscreen element in a cross-browser way.
1300-
$setLetterbox__deps: ['$JSEvents'],
13011298
$setLetterbox: (element, topBottom, leftRight) => {
13021299
// Cannot use margin to specify letterboxes in FF or Chrome, since those ignore margins in fullscreen mode.
13031300
element.style.paddingLeft = element.style.paddingRight = leftRight + 'px';
@@ -1307,7 +1304,7 @@ var LibraryHTML5 = {
13071304
$currentFullscreenStrategy: {},
13081305
$restoreOldWindowedStyle: null,
13091306

1310-
$softFullscreenResizeWebGLRenderTarget__deps: ['$JSEvents', '$setLetterbox', '$currentFullscreenStrategy', '$getCanvasElementSize', '$setCanvasElementSize', '$jstoi_q'],
1307+
$softFullscreenResizeWebGLRenderTarget__deps: ['$setLetterbox', '$currentFullscreenStrategy', '$getCanvasElementSize', '$setCanvasElementSize', '$jstoi_q'],
13111308
$softFullscreenResizeWebGLRenderTarget: () => {
13121309
var dpr = devicePixelRatio;
13131310
var inHiDPIFullscreenMode = currentFullscreenStrategy.canvasResolutionScaleMode == {{{ cDefs.EMSCRIPTEN_FULLSCREEN_CANVAS_SCALE_HIDEF }}};
@@ -1582,7 +1579,7 @@ var LibraryHTML5 = {
15821579
},
15831580

15841581
emscripten_set_pointerlockchange_callback_on_thread__proxy: 'sync',
1585-
emscripten_set_pointerlockchange_callback_on_thread__deps: ['$JSEvents', '$registerPointerlockChangeEventCallback', '$findEventTarget', '$specialHTMLTargets'],
1582+
emscripten_set_pointerlockchange_callback_on_thread__deps: ['$registerPointerlockChangeEventCallback', '$findEventTarget', '$specialHTMLTargets'],
15861583
emscripten_set_pointerlockchange_callback_on_thread__docs: '/** @suppress {missingProperties} */', // Closure does not see document.body.mozRequestPointerLock etc.
15871584
emscripten_set_pointerlockchange_callback_on_thread: (target, userData, useCapture, callbackfunc, targetThread) => {
15881585
// TODO: Currently not supported in pthreads or in --proxy-to-worker mode. (In pthreads mode, document object is not defined)
@@ -1627,7 +1624,7 @@ var LibraryHTML5 = {
16271624
},
16281625

16291626
emscripten_set_pointerlockerror_callback_on_thread__proxy: 'sync',
1630-
emscripten_set_pointerlockerror_callback_on_thread__deps: ['$JSEvents', '$registerPointerlockErrorEventCallback', '$findEventTarget', '$specialHTMLTargets'],
1627+
emscripten_set_pointerlockerror_callback_on_thread__deps: ['$registerPointerlockErrorEventCallback', '$findEventTarget', '$specialHTMLTargets'],
16311628
emscripten_set_pointerlockerror_callback_on_thread__docs: '/** @suppress {missingProperties} */', // Closure does not see document.body.mozRequestPointerLock etc.
16321629
emscripten_set_pointerlockerror_callback_on_thread: (target, userData, useCapture, callbackfunc, targetThread) => {
16331630
// TODO: Currently not supported in pthreads or in --proxy-to-worker mode. (In pthreads mode, document object is not defined)
@@ -2162,7 +2159,6 @@ var LibraryHTML5 = {
21622159

21632160
#if PTHREADS
21642161
$setCanvasElementSizeCallingThread__deps: [
2165-
'$JSEvents',
21662162
#if OFFSCREENCANVAS_SUPPORT
21672163
'$setOffscreenCanvasSizeOnTargetThread',
21682164
#endif
@@ -2240,7 +2236,7 @@ var LibraryHTML5 = {
22402236
$setCanvasElementSizeMainThread__deps: ['$setCanvasElementSizeCallingThread'],
22412237
$setCanvasElementSizeMainThread: (target, width, height) => setCanvasElementSizeCallingThread(target, width, height),
22422238

2243-
emscripten_set_canvas_element_size__deps: ['$JSEvents', '$setCanvasElementSizeCallingThread', '$setCanvasElementSizeMainThread', '$findCanvasEventTarget'],
2239+
emscripten_set_canvas_element_size__deps: ['$setCanvasElementSizeCallingThread', '$setCanvasElementSizeMainThread', '$findCanvasEventTarget'],
22442240
emscripten_set_canvas_element_size: (target, width, height) => {
22452241
#if GL_DEBUG
22462242
dbg(`emscripten_set_canvas_element_size(target=${target},width=${width},height=${height}`);
@@ -2252,7 +2248,7 @@ var LibraryHTML5 = {
22522248
return setCanvasElementSizeMainThread(target, width, height);
22532249
},
22542250
#else
2255-
emscripten_set_canvas_element_size__deps: ['$JSEvents', '$findCanvasEventTarget'],
2251+
emscripten_set_canvas_element_size__deps: ['$findCanvasEventTarget'],
22562252
emscripten_set_canvas_element_size: (target, width, height) => {
22572253
#if GL_DEBUG
22582254
dbg(`emscripten_set_canvas_element_size(target=${target},width=${width},height=${height}`);
@@ -2287,7 +2283,7 @@ var LibraryHTML5 = {
22872283
},
22882284

22892285
#if PTHREADS
2290-
$getCanvasSizeCallingThread__deps: ['$JSEvents', '$findCanvasEventTarget'],
2286+
$getCanvasSizeCallingThread__deps: ['$findCanvasEventTarget'],
22912287
$getCanvasSizeCallingThread: (target, width, height) => {
22922288
var canvas = findCanvasEventTarget(target);
22932289
if (!canvas) return {{{ cDefs.EMSCRIPTEN_RESULT_UNKNOWN_TARGET }}};
@@ -2322,7 +2318,7 @@ var LibraryHTML5 = {
23222318
$getCanvasSizeMainThread__deps: ['$getCanvasSizeCallingThread'],
23232319
$getCanvasSizeMainThread: (target, width, height) => getCanvasSizeCallingThread(target, width, height),
23242320

2325-
emscripten_get_canvas_element_size__deps: ['$JSEvents', '$getCanvasSizeCallingThread', '$getCanvasSizeMainThread', '$findCanvasEventTarget'],
2321+
emscripten_get_canvas_element_size__deps: ['$getCanvasSizeCallingThread', '$getCanvasSizeMainThread', '$findCanvasEventTarget'],
23262322
emscripten_get_canvas_element_size: (target, width, height) => {
23272323
var canvas = findCanvasEventTarget(target);
23282324
if (canvas) {
@@ -2331,7 +2327,7 @@ var LibraryHTML5 = {
23312327
return getCanvasSizeMainThread(target, width, height);
23322328
},
23332329
#else
2334-
emscripten_get_canvas_element_size__deps: ['$JSEvents', '$findCanvasEventTarget'],
2330+
emscripten_get_canvas_element_size__deps: ['$findCanvasEventTarget'],
23352331
emscripten_get_canvas_element_size: (target, width, height) => {
23362332
var canvas = findCanvasEventTarget(target);
23372333
if (!canvas) return {{{ cDefs.EMSCRIPTEN_RESULT_UNKNOWN_TARGET }}};
@@ -2355,7 +2351,7 @@ var LibraryHTML5 = {
23552351
},
23562352

23572353
emscripten_set_element_css_size__proxy: 'sync',
2358-
emscripten_set_element_css_size__deps: ['$JSEvents', '$findEventTarget'],
2354+
emscripten_set_element_css_size__deps: ['$findEventTarget'],
23592355
emscripten_set_element_css_size: (target, width, height) => {
23602356
#if DISABLE_DEPRECATED_FIND_EVENT_TARGET_BEHAVIOR
23612357
target = findEventTarget(target);
@@ -2371,7 +2367,7 @@ var LibraryHTML5 = {
23712367
},
23722368

23732369
emscripten_get_element_css_size__proxy: 'sync',
2374-
emscripten_get_element_css_size__deps: ['$JSEvents', '$findEventTarget', '$getBoundingClientRect'],
2370+
emscripten_get_element_css_size__deps: ['$findEventTarget', '$getBoundingClientRect'],
23752371
emscripten_get_element_css_size: (target, width, height) => {
23762372
#if DISABLE_DEPRECATED_FIND_EVENT_TARGET_BEHAVIOR
23772373
target = findEventTarget(target);

src/lib/libhtml5_webgl.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ var LibraryHtml5WebGL = {
6565
#if PTHREADS && OFFSCREEN_FRAMEBUFFER
6666
'emscripten_webgl_create_context_proxied',
6767
#endif
68-
'$JSEvents', '$webglPowerPreferences', '$findEventTarget', '$findCanvasEventTarget'],
68+
'$webglPowerPreferences', '$findEventTarget', '$findCanvasEventTarget'],
6969
// This function performs proxying manually, depending on the style of context that is to be created.
7070
emscripten_webgl_do_create_context: (target, attributes) => {
7171
#if ASSERTIONS

0 commit comments

Comments
 (0)