Stan/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

SpiderMonkey 38 upgrade: 35/35

Browse Source 
Some comments for the next SpiderMonkey upgrade. That's all folks, fixes
#3708

This was SVN commit r18689.
This commit is contained in:
Nicolas Auvray 2016-09-02 16:55:13 +00:00
parent 2a33c4476f
commit 8284cc4302
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -230,6 +230,8 @@ void CBinarySerializerScriptImpl::HandleScriptVal(JS::HandleValue val)
m_Serializer.Bool("value", b); m_Serializer.Bool("value", b);
break; break;
} }
// TODO: Follow upstream progresses about a JS::IsMapObject
// https://bugzilla.mozilla.org/show_bug.cgi?id=1285909
else if (protokey == JSProto_Map) else if (protokey == JSProto_Map)
{ {
m_Serializer.NumberU8_Unbounded("type", SCRIPT_TYPE_OBJECT_MAP); m_Serializer.NumberU8_Unbounded("type", SCRIPT_TYPE_OBJECT_MAP);
@ -264,6 +266,8 @@ void CBinarySerializerScriptImpl::HandleScriptVal(JS::HandleValue val)
} }
break; break;
} }
// TODO: Follow upstream progresses about a JS::IsSetObject
// https://bugzilla.mozilla.org/show_bug.cgi?id=1285909
else if (protokey == JSProto_Set) else if (protokey == JSProto_Set)
{ {
// TODO: When updating SpiderMonkey to a release after 38 use the C++ API for Sets. // TODO: When updating SpiderMonkey to a release after 38 use the C++ API for Sets.

1
source/simulation2/serialization/StdDeserializer.cpp
View File

@ -239,6 +239,7 @@ jsval CStdDeserializer::ReadScriptVal(const char* UNUSED(name), JS::HandleObject
JS::RootedValue propval(cx, ReadScriptVal("prop value", JS::NullPtr())); JS::RootedValue propval(cx, ReadScriptVal("prop value", JS::NullPtr()));
utf16string prp(propname.begin(), propname.end());; utf16string prp(propname.begin(), propname.end());;
// TODO: Should ask upstream about getting a variant of JS_SetProperty with a length param.
if (!JS_SetUCProperty(cx, obj, (const char16_t*)prp.data(), prp.length(), propval)) if (!JS_SetUCProperty(cx, obj, (const char16_t*)prp.data(), prp.length(), propval))
throw PSERROR_Deserialize_ScriptError(); throw PSERROR_Deserialize_ScriptError();
} }