Yves
e9e05f4efc
This commit contains all the required changes to our source files and build scripts (hopefully). A next commit will remove the old stuff of SpiderMonkey 1.8.5. Spcial thanks to: - H4writer who helped a lot mainly with the performance issues we had/have, but also with other problems or questions. - Leper for the review. - Historic_bruno for implementing the build scripts on Mac OS X and testing on the Mac. - The people from the #jsapi channel and from mozilla.dev.tech.js-engine who answered a lot of questions and helped solving problems. - All the other people who helped Refs #1886 Fixes #2442 Fixes #2416 This was SVN commit r14877.
73 lines
1.7 KiB
C++
73 lines
1.7 KiB
C++
/* Copyright (C) 2010 Wildfire Games.
|
|
* This file is part of 0 A.D.
|
|
*
|
|
* 0 A.D. is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation, either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* 0 A.D. is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with 0 A.D. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include "precompiled.h"
|
|
|
|
#include "ScriptInterface.h"
|
|
#include "ScriptVal.h"
|
|
|
|
|
|
struct Unrooter
|
|
{
|
|
Unrooter(JSContext* cx) : cx(cx) { }
|
|
void operator()(jsval* p)
|
|
{
|
|
JSAutoRequest rq(cx);
|
|
JS_RemoveValueRoot(cx, p); delete p;
|
|
}
|
|
JSContext* cx;
|
|
};
|
|
|
|
CScriptValRooted::CScriptValRooted(JSContext* cx, jsval val)
|
|
{
|
|
JSAutoRequest rq(cx);
|
|
jsval* p = new jsval(val);
|
|
JS_AddNamedValueRoot(cx, p, "CScriptValRooted");
|
|
m_Val = boost::shared_ptr<jsval>(p, Unrooter(cx));
|
|
}
|
|
|
|
CScriptValRooted::CScriptValRooted(JSContext* cx, CScriptVal val)
|
|
{
|
|
JSAutoRequest rq(cx);
|
|
jsval* p = new jsval(val.get());
|
|
JS_AddNamedValueRoot(cx, p, "CScriptValRooted");
|
|
m_Val = boost::shared_ptr<jsval>(p, Unrooter(cx));
|
|
}
|
|
|
|
jsval CScriptValRooted::get() const
|
|
{
|
|
if (!m_Val)
|
|
return JSVAL_VOID;
|
|
return *m_Val;
|
|
}
|
|
|
|
jsval& CScriptValRooted::getRef() const
|
|
{
|
|
ENSURE(m_Val);
|
|
return *m_Val;
|
|
}
|
|
|
|
bool CScriptValRooted::undefined() const
|
|
{
|
|
return (!m_Val || JSVAL_IS_VOID(*m_Val));
|
|
}
|
|
|
|
bool CScriptValRooted::uninitialised() const
|
|
{
|
|
return !m_Val;
|
|
}
|