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

Use JS::Trace over CallXTracer

Browse Source 
CallXTracer functions were removed in
https://bugzilla.mozilla.org/show_bug.cgi?id=1235598

Part of the SM52 migration, stage: SM45 compatible.

Patch by: Itms
Tested By: Freagarach
Refs #4893

Differential Revision: https://code.wildfiregames.com/D3092
This was SVN commit r24169.
This commit is contained in:
wraitii 2020-11-12 08:04:24 +00:00
parent dad2857538
commit ace639f96f
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/gui/ObjectBases/IGUIObject.cpp
View File

@ -517,7 +517,7 @@ void IGUIObject::TraceMember(JSTracer* trc)
// Please ensure to adapt the Tracer enabling and disabling in accordance with the GC things traced!
for (std::pair<const CStr, JS::Heap<JSObject*>>& handler : m_ScriptHandlers)
JS_CallObjectTracer(trc, &handler.second, "IGUIObject::m_ScriptHandlers");
JS::TraceEdge(trc, &handler.second, "IGUIObject::m_ScriptHandlers");
}
// Instantiate templated functions:

4
source/lobby/XmppClient.cpp
View File

@ -198,10 +198,10 @@ XmppClient::~XmppClient()
void XmppClient::TraceMember(JSTracer* trc)
{
for (JS::Heap<JS::Value>& guiMessage : m_GuiMessageQueue)
JS_CallValueTracer(trc, &guiMessage, "m_GuiMessageQueue");
JS::TraceEdge(trc, &guiMessage, "m_GuiMessageQueue");
for (JS::Heap<JS::Value>& guiMessage : m_HistoricGuiMessages)
JS_CallValueTracer(trc, &guiMessage, "m_HistoricGuiMessages");
JS::TraceEdge(trc, &guiMessage, "m_HistoricGuiMessages");
}
/// Network

2
source/network/NetClient.cpp
View File

@ -150,7 +150,7 @@ CNetClient::~CNetClient()
void CNetClient::TraceMember(JSTracer *trc)
{
for (JS::Heap<JS::Value>& guiMessage : m_GuiMessageQueue)
JS_CallValueTracer(trc, &guiMessage, "m_GuiMessageQueue");
JS::TraceEdge(trc, &guiMessage, "m_GuiMessageQueue");
}
void CNetClient::SetUserName(const CStrW& username)

2
source/simulation2/components/CCmpAIManager.cpp
View File

@ -826,7 +826,7 @@ private:
void TraceMember(JSTracer *trc)
{
for (std::pair<const VfsPath, JS::Heap<JS::Value>>& metadata : m_PlayerMetadata)
JS_CallValueTracer(trc, &metadata.second, "CAIWorker::m_PlayerMetadata");
JS::TraceEdge(trc, &metadata.second, "CAIWorker::m_PlayerMetadata");
}
void LoadMetadata(const VfsPath& path, JS::MutableHandleValue out)

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

@ -45,8 +45,8 @@ void CStdDeserializer::Trace(JSTracer *trc, void *data)
void CStdDeserializer::TraceMember(JSTracer *trc)
{
for (size_t i=0; i<m_ScriptBackrefs.size(); ++i)
JS_CallObjectTracer(trc, &m_ScriptBackrefs[i], "StdDeserializer::m_ScriptBackrefs");
for (JS::Heap<JSObject*>& backref : m_ScriptBackrefs)
JS::TraceEdge(trc, &backref, "StdDeserializer::m_ScriptBackrefs");
}
void CStdDeserializer::Get(const char* name, u8* data, size_t len)