Skip to content

Commit 8d571ec

Browse files
authored
Remove unsed/unneeded code in in proxyClient.js (#22512)
The code being removed here was never been used because the local `SUPPORT_BASE64_EMBEDDING` variable was never being set. The code is not needed since `new Worker` already operates on data URLs and `<<< filename >>>` is encoded as a data URL in SINGLE_FILE mode.
1 parent 0964af1 commit 8d571ec

File tree

2 files changed

+3
-15
lines changed

2 files changed

+3
-15
lines changed

src/proxyClient.js

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -120,23 +120,12 @@ if (typeof window != 'undefined') {
120120

121121
var frameId = 0;
122122

123-
// Temporarily handling this at run-time pending Python preprocessor support
124-
125-
var SUPPORT_BASE64_EMBEDDING;
126-
127123
// Worker
128124

129125
var filename;
130126
filename ||= '<<< filename >>>';
131127

132-
var workerURL = filename;
133-
if (SUPPORT_BASE64_EMBEDDING) {
134-
var fileBytes = tryParseAsDataURI(filename);
135-
if (fileBytes) {
136-
workerURL = URL.createObjectURL(new Blob([fileBytes], {type: 'application/javascript'}));
137-
}
138-
}
139-
var worker = new Worker(workerURL);
128+
var worker = new Worker(filename);
140129

141130
#if ENVIRONMENT_MAY_BE_NODE
142131
if (ENVIRONMENT_IS_NODE) {
@@ -166,7 +155,6 @@ worker.onmessage = (event) => {
166155
if (!workerResponded) {
167156
workerResponded = true;
168157
Module.setStatus?.('');
169-
if (SUPPORT_BASE64_EMBEDDING && workerURL !== filename) URL.revokeObjectURL(workerURL);
170158
}
171159

172160
var data = event.data;

tools/link.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2640,7 +2640,7 @@ def generate_html(target, options, js_target, target_basename, wasm_target):
26402640

26412641
def generate_worker_js(target, js_target, target_basename):
26422642
if settings.SINGLE_FILE:
2643-
# compiler output is embedded as base64
2643+
# compiler output is embedded as base64 data URL
26442644
proxy_worker_filename = get_subresource_location(js_target)
26452645
else:
26462646
# compiler output goes in .worker.js file
@@ -2655,7 +2655,7 @@ def generate_worker_js(target, js_target, target_basename):
26552655
def worker_js_script(proxy_worker_filename):
26562656
web_gl_client_src = read_file(utils.path_from_root('src/webGLClient.js'))
26572657
proxy_client_src = shared.read_and_preprocess(utils.path_from_root('src/proxyClient.js'), expand_macros=True)
2658-
if not os.path.dirname(proxy_worker_filename):
2658+
if not settings.SINGLE_FILE and not os.path.dirname(proxy_worker_filename):
26592659
proxy_worker_filename = './' + proxy_worker_filename
26602660
proxy_client_src = do_replace(proxy_client_src, '<<< filename >>>', proxy_worker_filename)
26612661
return web_gl_client_src + '\n' + proxy_client_src

0 commit comments

Comments
 (0)