gptbot/0ad
1
0
Fork 0
forked from mirrors/0ad
Code Pull Requests Activity

Exact stack rooting for ScriptInterface::ToString.

Browse Source 
I had to change a few other functions to take JS::MutableHandleValue
because JS::Stringify takes a JS::MutableHandleValue as input parameter.
That seems a bit strange because it should not change that value.
I assume it has historical reasons.

Refs #2415
Refs #2462

This was SVN commit r15605.
This commit is contained in:
Yves
2014-08-03 17:29:49 +00:00
parent 1561f55b27
commit 169174824f
16 changed files with 50 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/network/NetClient.cpp
+6 -3
View File
@@ -185,13 +185,16 @@ void CNetClient::PushGuiMessage(const CScriptValRooted& message)
std::wstring CNetClient::TestReadGuiMessages()
{
JSContext* cx = GetScriptInterface().GetContext();
JSAutoRequest rq(cx);
std::wstring r;
while (true)
{
CScriptValRooted msg = GuiPoll();
if (msg.undefined())
JS::RootedValue msg(cx, GuiPoll().get());
if (msg.isUndefined())
break;
r += GetScriptInterface().ToString(msg.get()) + L"\n";
r += GetScriptInterface().ToString(&msg) + L"\n";
}
return r;
}