Skip to content

Commit e415e01

Browse files
authored
Use Object.assign in a few more places. NFC (#15823)
Followup to #15822
1 parent 2984b0a commit e415e01

10 files changed

+17
-18
lines changed

src/library.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3329,10 +3329,8 @@ LibraryManager.library = {
33293329
#endif
33303330
var argCache = [];
33313331
return function() {
3332-
argCache.length = arguments.length;
3333-
for (var i = 0; i < arguments.length; i++) {
3334-
argCache[i] = arguments[i];
3335-
}
3332+
argCache.length = 0;
3333+
Object.assign(argCache, arguments);
33363334
return dynCall(sig, ptr, argCache);
33373335
};
33383336
},

src/library_fs.js

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -422,11 +422,7 @@ FS.staticInit();` +
422422
};
423423
}
424424
// clone it, so we can return an instance of FSStream
425-
var newStream = new FS.FSStream();
426-
for (var p in stream) {
427-
newStream[p] = stream[p];
428-
}
429-
stream = newStream;
425+
stream = Object.assign(new FS.FSStream(), stream);
430426
var fd = FS.nextfd(fd_start, fd_end);
431427
stream.fd = fd;
432428
FS.streams[fd] = stream;

src/library_pthread.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -161,9 +161,7 @@ var LibraryPThread = {
161161
receiveObjectTransfer: function(data) {
162162
#if OFFSCREENCANVAS_SUPPORT
163163
if (typeof GL !== 'undefined') {
164-
for (var i in data.offscreenCanvases) {
165-
GL.offscreenCanvases[i] = data.offscreenCanvases[i];
166-
}
164+
Object.assign(GL.offscreenCanvases, data.offscreenCanvases);
167165
if (!Module['canvas'] && data.moduleCanvasId && GL.offscreenCanvases[data.moduleCanvasId]) {
168166
Module['canvas'] = GL.offscreenCanvases[data.moduleCanvasId].offscreenCanvas;
169167
Module['canvas'].id = data.moduleCanvasId;

src/shell_minimal.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,13 @@ function ready() {
125125
#endif
126126
}
127127

128+
#if POLYFILL
129+
// See https://caniuse.com/mdn-javascript_builtins_object_assign
130+
#if MIN_CHROME_VERSION < 45 || MIN_EDGE_VERSION < 12 || MIN_FIREFOX_VERSION < 34 || MIN_IE_VERSION != TARGET_NOT_SUPPORTED || MIN_SAFARI_VERSION < 90000
131+
#include "polyfill/objassign.js"
132+
#endif
133+
#endif
134+
128135
// --pre-jses are emitted after the Module integration code, so that they can
129136
// refer to Module (if they choose; they can also define Module)
130137

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
96785
1+
96720
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
96785
1+
96720
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
96683
1+
96618
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
110239
1+
110174
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
111226
1+
111161
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
97046
1+
96981

0 commit comments

Comments
 (0)