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

SpiderMonkey 38 upgrade: 15/35

Browse Source 
Temporary workaround dropping of parent parameter from JS_NewObject* by
switching to JS_NewObjectWithGivenProto.

We should just drop support for serializing the parent since upstream is
dropping the parent parameter from all those functions.

Patch by leper.
Addresses https://bugzilla.mozilla.org/show_bug.cgi?id=1136906 and
https://bugzilla.mozilla.org/show_bug.cgi?id=1136345

This was SVN commit r18669.
This commit is contained in:
Nicolas Auvray 2016-09-02 16:30:35 +00:00
parent c3710c9632
commit ef764d5d64
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -189,7 +189,8 @@ jsval CStdDeserializer::ReadScriptVal(const char* UNUSED(name), JS::HandleObject
if (!proto || !parent)
throw PSERROR_Deserialize_ScriptError();
obj.set(JS_NewObject(cx, nullptr, proto, parent));
// TODO: Remove support for parent since this is dropped upstream SpiderMonkey
obj.set(JS_NewObjectWithGivenProto(cx, nullptr, proto, parent));
if (!obj)
throw PSERROR_Deserialize_ScriptError("JS_NewObject failed");