Skip to content

Commit 4809c7a

Browse files
committed
smalloc: update use of ExternalArrayType constants
The constants in enum v8::ExternalArrayType have been changed. The old values are there for legacy reasons, but it's best to update anyway. Signed-off-by: Trevor Norris <[email protected]>
1 parent 6e4bd49 commit 4809c7a

File tree

2 files changed

+11
-10
lines changed

2 files changed

+11
-10
lines changed

lib/smalloc.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ Object.defineProperty(exports, 'kMaxLength', {
3737
// enumerated values for different external array types
3838
var Types = {};
3939

40+
// Must match enum v8::ExternalArrayType.
4041
Object.defineProperties(Types, {
4142
'Int8': { enumerable: true, value: 1, writable: false },
4243
'Uint8': { enumerable: true, value: 2, writable: false },
@@ -68,7 +69,7 @@ function alloc(n, obj, type) {
6869
throw new TypeError('obj must be an Object');
6970
}
7071

71-
// 1 == v8::kExternalByteArray, 9 == v8::kExternalPixelArray
72+
// 1 == v8::kExternalUint8Array, 9 == v8::kExternalUint8ClampedArray
7273
if (type < 1 || type > 9)
7374
throw new TypeError('unknown external array type: ' + type);
7475
if (util.isArray(obj))

src/smalloc.cc

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -147,23 +147,23 @@ void CallbackInfo::WeakCallback(Isolate* isolate, Local<Object> object) {
147147
// return size of external array type, or 0 if unrecognized
148148
size_t ExternalArraySize(enum ExternalArrayType type) {
149149
switch (type) {
150-
case v8::kExternalUnsignedByteArray:
150+
case v8::kExternalUint8Array:
151151
return sizeof(uint8_t);
152-
case v8::kExternalByteArray:
152+
case v8::kExternalInt8Array:
153153
return sizeof(int8_t);
154-
case v8::kExternalShortArray:
154+
case v8::kExternalInt16Array:
155155
return sizeof(int16_t);
156-
case v8::kExternalUnsignedShortArray:
156+
case v8::kExternalUint16Array:
157157
return sizeof(uint16_t);
158-
case v8::kExternalIntArray:
158+
case v8::kExternalInt32Array:
159159
return sizeof(int32_t);
160-
case v8::kExternalUnsignedIntArray:
160+
case v8::kExternalUint32Array:
161161
return sizeof(uint32_t);
162-
case v8::kExternalFloatArray:
162+
case v8::kExternalFloat32Array:
163163
return sizeof(float); // NOLINT(runtime/sizeof)
164-
case v8::kExternalDoubleArray:
164+
case v8::kExternalFloat64Array:
165165
return sizeof(double); // NOLINT(runtime/sizeof)
166-
case v8::kExternalPixelArray:
166+
case v8::kExternalUint8ClampedArray:
167167
return sizeof(uint8_t);
168168
}
169169
return 0;

0 commit comments

Comments
 (0)