From 2db0fb27ae0afab960a27158bce01497bbe17689 Mon Sep 17 00:00:00 2001 From: Itms Date: Fri, 2 Sep 2016 16:36:40 +0000 Subject: [PATCH] SpiderMonkey 38 upgrade: 21/35 The naming conventions for typed array types changed. Patch by leper. Addresses https://bugzilla.mozilla.org/show_bug.cgi?id=1021790 This was SVN commit r18675. --- .../serialization/BinarySerializer.cpp | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/source/simulation2/serialization/BinarySerializer.cpp b/source/simulation2/serialization/BinarySerializer.cpp index 7f7e82f54a..ad62080d6c 100644 --- a/source/simulation2/serialization/BinarySerializer.cpp +++ b/source/simulation2/serialization/BinarySerializer.cpp @@ -26,27 +26,27 @@ #include "scriptinterface/ScriptExtraHeaders.h" #include "SerializedScriptTypes.h" -static u8 GetArrayType(JSArrayBufferViewType arrayType) +static u8 GetArrayType(js::Scalar::Type arrayType) { switch(arrayType) { - case js::ArrayBufferView::TYPE_INT8: + case js::Scalar::Int8: return SCRIPT_TYPED_ARRAY_INT8; - case js::ArrayBufferView::TYPE_UINT8: + case js::Scalar::Uint8: return SCRIPT_TYPED_ARRAY_UINT8; - case js::ArrayBufferView::TYPE_INT16: + case js::Scalar::Int16: return SCRIPT_TYPED_ARRAY_INT16; - case js::ArrayBufferView::TYPE_UINT16: + case js::Scalar::Uint16: return SCRIPT_TYPED_ARRAY_UINT16; - case js::ArrayBufferView::TYPE_INT32: + case js::Scalar::Int32: return SCRIPT_TYPED_ARRAY_INT32; - case js::ArrayBufferView::TYPE_UINT32: + case js::Scalar::Uint32: return SCRIPT_TYPED_ARRAY_UINT32; - case js::ArrayBufferView::TYPE_FLOAT32: + case js::Scalar::Float32: return SCRIPT_TYPED_ARRAY_FLOAT32; - case js::ArrayBufferView::TYPE_FLOAT64: + case js::Scalar::Float64: return SCRIPT_TYPED_ARRAY_FLOAT64; - case js::ArrayBufferView::TYPE_UINT8_CLAMPED: + case js::Scalar::Uint8Clamped: return SCRIPT_TYPED_ARRAY_UINT8_CLAMPED; default: LOGERROR("Cannot serialize unrecognized typed array view: %d", arrayType);