Dunedan/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Wiki Activity

SpiderMonkey 38 upgrade: 21/35

Browse Source 
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.
This commit is contained in:
Nicolas Auvray 2016-09-02 16:36:40 +00:00
parent f77441fb10
commit 2db0fb27ae
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
source/simulation2/serialization/BinarySerializer.cpp
View File

@ -26,27 +26,27 @@
#include "scriptinterface/ScriptExtraHeaders.h" #include "scriptinterface/ScriptExtraHeaders.h"
#include "SerializedScriptTypes.h" #include "SerializedScriptTypes.h"
static u8 GetArrayType(JSArrayBufferViewType arrayType) static u8 GetArrayType(js::Scalar::Type arrayType)
{ {
switch(arrayType) switch(arrayType)
{ {
case js::ArrayBufferView::TYPE_INT8: case js::Scalar::Int8:
return SCRIPT_TYPED_ARRAY_INT8; return SCRIPT_TYPED_ARRAY_INT8;
case js::ArrayBufferView::TYPE_UINT8: case js::Scalar::Uint8:
return SCRIPT_TYPED_ARRAY_UINT8; return SCRIPT_TYPED_ARRAY_UINT8;
case js::ArrayBufferView::TYPE_INT16: case js::Scalar::Int16:
return SCRIPT_TYPED_ARRAY_INT16; return SCRIPT_TYPED_ARRAY_INT16;
case js::ArrayBufferView::TYPE_UINT16: case js::Scalar::Uint16:
return SCRIPT_TYPED_ARRAY_UINT16; return SCRIPT_TYPED_ARRAY_UINT16;
case js::ArrayBufferView::TYPE_INT32: case js::Scalar::Int32:
return SCRIPT_TYPED_ARRAY_INT32; return SCRIPT_TYPED_ARRAY_INT32;
case js::ArrayBufferView::TYPE_UINT32: case js::Scalar::Uint32:
return SCRIPT_TYPED_ARRAY_UINT32; return SCRIPT_TYPED_ARRAY_UINT32;
case js::ArrayBufferView::TYPE_FLOAT32: case js::Scalar::Float32:
return SCRIPT_TYPED_ARRAY_FLOAT32; return SCRIPT_TYPED_ARRAY_FLOAT32;
case js::ArrayBufferView::TYPE_FLOAT64: case js::Scalar::Float64:
return SCRIPT_TYPED_ARRAY_FLOAT64; return SCRIPT_TYPED_ARRAY_FLOAT64;
case js::ArrayBufferView::TYPE_UINT8_CLAMPED: case js::Scalar::Uint8Clamped:
return SCRIPT_TYPED_ARRAY_UINT8_CLAMPED; return SCRIPT_TYPED_ARRAY_UINT8_CLAMPED;
default: default:
LOGERROR("Cannot serialize unrecognized typed array view: %d", arrayType); LOGERROR("Cannot serialize unrecognized typed array view: %d", arrayType);