Skip to content

Commit f720c58

Browse files
anonrigruyadorno
authored andcommitted
stream: use ArrayBufferPrototypeGetByteLength
PR-URL: #45528 Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com> Reviewed-By: Minwoo Jung <nodecorelab@gmail.com>
1 parent eac26c0 commit f720c58

File tree

2 files changed

+10
-15
lines changed

2 files changed

+10
-15
lines changed

lib/internal/webstreams/readablestream.js

+8-8
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
const {
66
ArrayBuffer,
7+
ArrayBufferPrototypeGetByteLength,
78
ArrayBufferPrototypeSlice,
89
ArrayPrototypePush,
910
ArrayPrototypeShift,
@@ -93,7 +94,6 @@ const {
9394
ArrayBufferViewGetBuffer,
9495
ArrayBufferViewGetByteLength,
9596
ArrayBufferViewGetByteOffset,
96-
ArrayBufferGetByteLength,
9797
AsyncIterator,
9898
cloneAsUint8Array,
9999
copyArrayBuffer,
@@ -667,7 +667,7 @@ class ReadableStreamBYOBRequest {
667667

668668
const viewByteLength = ArrayBufferViewGetByteLength(view);
669669
const viewBuffer = ArrayBufferViewGetBuffer(view);
670-
const viewBufferByteLength = ArrayBufferGetByteLength(viewBuffer);
670+
const viewBufferByteLength = ArrayBufferPrototypeGetByteLength(viewBuffer);
671671

672672
if (isDetachedBuffer(viewBuffer)) {
673673
throw new ERR_INVALID_STATE.TypeError('Viewed ArrayBuffer is detached');
@@ -906,7 +906,7 @@ class ReadableStreamBYOBReader {
906906

907907
const viewByteLength = ArrayBufferViewGetByteLength(view);
908908
const viewBuffer = ArrayBufferViewGetBuffer(view);
909-
const viewBufferByteLength = ArrayBufferGetByteLength(viewBuffer);
909+
const viewBufferByteLength = ArrayBufferPrototypeGetByteLength(viewBuffer);
910910

911911
if (viewByteLength === 0 || viewBufferByteLength === 0) {
912912
return PromiseReject(
@@ -1118,7 +1118,7 @@ class ReadableByteStreamController {
11181118
}
11191119
const chunkByteLength = ArrayBufferViewGetByteLength(chunk);
11201120
const chunkBuffer = ArrayBufferViewGetBuffer(chunk);
1121-
const chunkBufferByteLength = ArrayBufferGetByteLength(chunkBuffer);
1121+
const chunkBufferByteLength = ArrayBufferPrototypeGetByteLength(chunkBuffer);
11221122
if (chunkByteLength === 0 || chunkBufferByteLength === 0) {
11231123
throw new ERR_INVALID_STATE.TypeError(
11241124
'chunk ArrayBuffer is zero-length or detached');
@@ -2492,7 +2492,7 @@ function readableByteStreamControllerPullInto(
24922492
const buffer = ArrayBufferViewGetBuffer(view);
24932493
const byteOffset = ArrayBufferViewGetByteOffset(view);
24942494
const byteLength = ArrayBufferViewGetByteLength(view);
2495-
const bufferByteLength = ArrayBufferGetByteLength(buffer);
2495+
const bufferByteLength = ArrayBufferPrototypeGetByteLength(buffer);
24962496

24972497
let transferredBuffer;
24982498
try {
@@ -2795,7 +2795,7 @@ function readableByteStreamControllerFillPullIntoDescriptorFromQueue(
27952795
totalBytesToCopyRemaining,
27962796
headOfQueue.byteLength);
27972797
const destStart = byteOffset + desc.bytesFilled;
2798-
const arrayBufferByteLength = ArrayBufferGetByteLength(buffer);
2798+
const arrayBufferByteLength = ArrayBufferPrototypeGetByteLength(buffer);
27992799
if (arrayBufferByteLength - destStart < bytesToCopy) {
28002800
throw new ERR_INVALID_STATE.RangeError(
28012801
'view ArrayBuffer size is invalid');
@@ -2899,7 +2899,7 @@ function readableByteStreamControllerRespondInReadableState(
28992899
controller,
29002900
remainder,
29012901
0,
2902-
ArrayBufferGetByteLength(remainder));
2902+
ArrayBufferPrototypeGetByteLength(remainder));
29032903
}
29042904
desc.bytesFilled -= remainderSize;
29052905
readableByteStreamControllerCommitPullIntoDescriptor(
@@ -2921,7 +2921,7 @@ function readableByteStreamControllerRespondWithNewView(controller, view) {
29212921
const viewByteLength = ArrayBufferViewGetByteLength(view);
29222922
const viewByteOffset = ArrayBufferViewGetByteOffset(view);
29232923
const viewBuffer = ArrayBufferViewGetBuffer(view);
2924-
const viewBufferByteLength = ArrayBufferGetByteLength(viewBuffer);
2924+
const viewBufferByteLength = ArrayBufferPrototypeGetByteLength(viewBuffer);
29252925

29262926
if (stream[kState].state === 'closed') {
29272927
if (viewByteLength !== 0)

lib/internal/webstreams/util.js

+2-7
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'use strict';
22

33
const {
4-
ArrayBufferPrototype,
4+
ArrayBufferPrototypeGetByteLength,
55
ArrayBufferPrototypeSlice,
66
ArrayPrototypePush,
77
ArrayPrototypeShift,
@@ -109,10 +109,6 @@ function ArrayBufferViewGetByteOffset(view) {
109109
return ReflectGet(view.constructor.prototype, 'byteOffset', view);
110110
}
111111

112-
function ArrayBufferGetByteLength(view) {
113-
return ReflectGet(ArrayBufferPrototype, 'byteLength', view);
114-
}
115-
116112
function cloneAsUint8Array(view) {
117113
const buffer = ArrayBufferViewGetBuffer(view);
118114
const byteOffset = ArrayBufferViewGetByteOffset(view);
@@ -140,7 +136,7 @@ function transferArrayBuffer(buffer) {
140136
}
141137

142138
function isDetachedBuffer(buffer) {
143-
if (ArrayBufferGetByteLength(buffer) === 0) {
139+
if (ArrayBufferPrototypeGetByteLength(buffer) === 0) {
144140
// TODO(daeyeon): Consider using C++ builtin to improve performance.
145141
try {
146142
new Uint8Array(buffer);
@@ -244,7 +240,6 @@ module.exports = {
244240
ArrayBufferViewGetBuffer,
245241
ArrayBufferViewGetByteLength,
246242
ArrayBufferViewGetByteOffset,
247-
ArrayBufferGetByteLength,
248243
AsyncIterator,
249244
cloneAsUint8Array,
250245
copyArrayBuffer,

0 commit comments

Comments
 (0)