--- a/caps/src/nsJSPrincipals.cpp
+++ b/caps/src/nsJSPrincipals.cpp
@@ -63,17 +63,17 @@ nsGlobalPrivilegesEnabled(JSContext *cx,
}
static JSBool
nsJSPrincipalsSubsume(JSPrincipals *jsprin, JSPrincipals *other)
{
nsJSPrincipals *nsjsprin = static_cast<nsJSPrincipals *>(jsprin);
nsJSPrincipals *nsother = static_cast<nsJSPrincipals *>(other);
- JSBool result;
+ PRBool result;
nsresult rv = nsjsprin->nsIPrincipalPtr->Subsumes(nsother->nsIPrincipalPtr,
&result);
return NS_SUCCEEDED(rv) && result;
}
static void
nsDestroyJSPrincipals(JSContext *cx, struct JSPrincipals *jsprin)
{
--- a/caps/src/nsSecurityManagerFactory.cpp
+++ b/caps/src/nsSecurityManagerFactory.cpp
@@ -123,17 +123,17 @@ getUTF8StringArgument(JSContext *cx, JSO
static JSBool
netscape_security_isPrivilegeEnabled(JSContext *cx, uintN argc, jsval *vp)
{
JSObject *obj = JS_THIS_OBJECT(cx, vp);
if (!obj)
return JS_FALSE;
- JSBool result = JS_FALSE;
+ PRBool result = PR_FALSE;
if (JSString *str = getStringArgument(cx, obj, 0, argc, JS_ARGV(cx, vp))) {
JSAutoByteString cap(cx, str);
if (!cap)
return JS_FALSE;
nsresult rv;
nsCOMPtr<nsIScriptSecurityManager> securityManager =
do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv);
--- a/dom/base/nsDOMClassInfo.cpp
+++ b/dom/base/nsDOMClassInfo.cpp
@@ -6933,17 +6933,17 @@ nsWindowSH::NewResolve(nsIXPConnectWrapp
return NS_OK;
}
}
// Call GlobalResolve() after we call FindChildWithName() so
// that named child frames will override external properties
// which have been registered with the script namespace manager.
- JSBool did_resolve = JS_FALSE;
+ PRBool did_resolve = PR_FALSE;
rv = GlobalResolve(win, cx, obj, id, &did_resolve);
NS_ENSURE_SUCCESS(rv, rv);
if (did_resolve) {
// GlobalResolve() resolved something, so we're done here.
*objp = obj;
return NS_OK;
@@ -7073,17 +7073,17 @@ nsWindowSH::NewResolve(nsIXPConnectWrapp
isResolvingJavaProperties = PR_TRUE;
// Tell the window to initialize the Java properties. The
// window needs to do this as we need to do this only once,
// and detecting that reliably from here is hard.
win->InitJavaProperties();
- PRBool hasProp;
+ JSBool hasProp;
PRBool ok = ::JS_HasPropertyById(cx, obj, id, &hasProp);
isResolvingJavaProperties = PR_FALSE;
if (!ok) {
return NS_ERROR_FAILURE;
}
@@ -7791,17 +7791,18 @@ nsEventReceiverSH::NewResolve(nsIXPConne
// If we're assigning to an on* property, just resolve to null for
// now; the assignment will then set the right value. Only do this
// in the case where the property isn't already defined on the
// object's prototype chain though.
JSAutoRequest ar(cx);
JSObject *proto = ::JS_GetPrototype(cx, obj);
- PRBool ok = PR_TRUE, hasProp = PR_FALSE;
+ PRBool ok = PR_TRUE;
+ JSBool hasProp = JS_FALSE;
if (!proto || ((ok = ::JS_HasPropertyById(cx, proto, id, &hasProp)) &&
!hasProp)) {
// Make sure the flags here match those in
// nsJSContext::BindCompiledEventHandler
if (!::JS_DefinePropertyById(cx, obj, id, JSVAL_NULL, nsnull, nsnull,
JSPROP_ENUMERATE | JSPROP_PERMANENT)) {
return NS_ERROR_FAILURE;
}
--- a/dom/base/nsJSEnvironment.cpp
+++ b/dom/base/nsJSEnvironment.cpp
@@ -1010,17 +1010,17 @@ nsJSContext::JSOptionChangedCallback(con
::JS_SetOptions(context->mContext, newDefaultJSOptions & JSRUNOPTION_MASK);
// Save the new defaults for the next page load (InitContext).
context->mDefaultJSOptions = newDefaultJSOptions;
#ifdef JS_GC_ZEAL
PRInt32 zeal = Preferences::GetInt(js_zeal_option_str, -1);
PRInt32 frequency = Preferences::GetInt(js_zeal_frequency_str, JS_DEFAULT_ZEAL_FREQ);
- PRBool compartment = Preferences::GetBool(js_zeal_compartment_str, JS_FALSE);
+ PRBool compartment = Preferences::GetBool(js_zeal_compartment_str, PR_FALSE);
if (zeal >= 0)
::JS_SetGCZeal(context->mContext, (PRUint8)zeal, frequency, compartment);
#endif
return 0;
}
nsJSContext::nsJSContext(JSRuntime *aRuntime)
--- a/js/jsd/jsd_xpc.cpp
+++ b/js/jsd/jsd_xpc.cpp
@@ -2568,17 +2568,17 @@ jsdService::AsyncOn (jsdIActivationCallb
if (NS_FAILED(rv)) return rv;
mActivationCallback = activationCallback;
return xpc->SetDebugModeWhenPossible(PR_TRUE);
}
NS_IMETHODIMP
-jsdService::RecompileForDebugMode (JSContext *cx, JSCompartment *comp, JSBool mode) {
+jsdService::RecompileForDebugMode (JSContext *cx, JSCompartment *comp, PRBool mode) {
NS_ASSERTION(NS_IsMainThread(), "wrong thread");
/* XPConnect now does this work itself, so this IDL entry point is no longer used. */
return NS_ERROR_NOT_IMPLEMENTED;
}
NS_IMETHODIMP
jsdService::DeactivateDebugger ()
{
--- a/js/src/xpconnect/src/qsgen.py
+++ b/js/src/xpconnect/src/qsgen.py
@@ -460,17 +460,17 @@ argumentUnboxingTemplates = {
" float ${name} = (float) ${name}_dbl;\n",
'double':
" jsdouble ${name};\n"
" if (!JS_ValueToNumber(cx, ${argVal}, &${name}))\n"
" return JS_FALSE;\n",
'boolean':
- " PRBool ${name};\n"
+ " JSBool ${name};\n"
" JS_ValueToBoolean(cx, ${argVal}, &${name});\n",
'[astring]':
" xpc_qsAString ${name}(cx, ${argVal}, ${argPtr});\n"
" if (!${name}.IsValid())\n"
" return JS_FALSE;\n",
'[domstring]':
--- a/js/src/xpconnect/src/xpccomponents.cpp
+++ b/js/src/xpconnect/src/xpccomponents.cpp
@@ -55,17 +55,17 @@
#include "nsNullPrincipal.h"
#include "nsJSUtils.h"
#include "mozJSComponentLoader.h"
#include "nsContentUtils.h"
/***************************************************************************/
// stuff used by all
-static nsresult ThrowAndFail(uintN errNum, JSContext* cx, JSBool* retval)
+static nsresult ThrowAndFail(uintN errNum, JSContext* cx, PRBool* retval)
{
XPCThrower::Throw(errNum, cx);
*retval = JS_FALSE;
return NS_OK;
}
static JSBool
JSValIsInterfaceOfType(JSContext *cx, jsval v, REFNSIID iid)
--- a/js/src/xpconnect/src/xpcconvert.cpp
+++ b/js/src/xpconnect/src/xpcconvert.cpp
@@ -542,16 +542,17 @@ XPCConvert::JSData2Native(XPCCallContext
{
NS_PRECONDITION(d, "bad param");
JSContext* cx = ccx.GetJSContext();
int32 ti;
uint32 tu;
jsdouble td;
+ JSBool tb;
JSBool isDOMString = JS_TRUE;
if(pErr)
*pErr = NS_ERROR_XPC_BAD_CONVERT_JS;
switch(type.TagPart())
{
case nsXPTType::T_I8 :
@@ -621,17 +622,18 @@ XPCConvert::JSData2Native(XPCCallContext
return JS_FALSE;
*((float*)d) = (float) td;
break;
case nsXPTType::T_DOUBLE :
if(!JS_ValueToNumber(cx, s, (double*)d))
return JS_FALSE;
break;
case nsXPTType::T_BOOL :
- JS_ValueToBoolean(cx, s, (JSBool*)d);
+ JS_ValueToBoolean(cx, s, &tb);
+ *((PRBool*)d) = tb;
break;
case nsXPTType::T_CHAR :
{
JSString* str = JS_ValueToString(cx, s);
if(!str)
{
return JS_FALSE;
}
--- a/js/src/xpconnect/src/xpcinlines.h
+++ b/js/src/xpconnect/src/xpcinlines.h
@@ -675,37 +675,16 @@ xpc_NewSystemInheritingJSObject(JSContex
} else {
obj = JS_NewObject(cx, clasp, proto, parent);
}
if (obj && JS_IsSystemObject(cx, parent) && !JS_MakeSystemObject(cx, obj))
obj = NULL;
return obj;
}
-inline JSBool
-xpc_SameScope(XPCWrappedNativeScope *objectscope, XPCWrappedNativeScope *xpcscope,
- JSBool *sameOrigin)
-{
- if (objectscope == xpcscope)
- {
- *sameOrigin = JS_TRUE;
- return JS_TRUE;
- }
-
- nsIPrincipal *objectprincipal = objectscope->GetPrincipal();
- nsIPrincipal *xpcprincipal = xpcscope->GetPrincipal();
- if(!objectprincipal || !xpcprincipal ||
- NS_FAILED(objectprincipal->Equals(xpcprincipal, sameOrigin)))
- {
- *sameOrigin = JS_FALSE;
- }
-
- return JS_FALSE;
-}
-
inline jsid
GetRTIdByIndex(JSContext *cx, uintN index)
{
XPCJSRuntime *rt = nsXPConnect::FastGetXPConnect()->GetRuntime();
return rt->GetStringID(index);
}
inline jsval
--- a/js/src/xpconnect/src/xpcjsruntime.cpp
+++ b/js/src/xpconnect/src/xpcjsruntime.cpp
@@ -990,17 +990,17 @@ XPCJSRuntime::WatchdogMain(void *arg)
}
/* Wake up the main thread waiting for the watchdog to terminate. */
PR_NotifyCondVar(self->mWatchdogWakeup);
}
//static
void
-XPCJSRuntime::ActivityCallback(void *arg, PRBool active)
+XPCJSRuntime::ActivityCallback(void *arg, JSBool active)
{
XPCJSRuntime* self = static_cast<XPCJSRuntime*>(arg);
if (active) {
self->mLastActiveTime = -1;
if (self->mWatchdogHibernating)
{
self->mWatchdogHibernating = PR_FALSE;
PR_NotifyCondVar(self->mWatchdogWakeup);
--- a/js/src/xpconnect/src/xpcmaps.cpp
+++ b/js/src/xpconnect/src/xpcmaps.cpp
@@ -542,17 +542,17 @@ XPCNativeScriptableSharedMap::~XPCNative
{
if(mTable)
JS_DHashTableDestroy(mTable);
}
JSBool
XPCNativeScriptableSharedMap::GetNewOrUsed(JSUint32 flags,
char* name,
- JSBool isGlobal,
+ PRBool isGlobal,
PRUint32 interfacesBitmap,
XPCNativeScriptableInfo* si)
{
NS_PRECONDITION(name,"bad param");
NS_PRECONDITION(si,"bad param");
XPCNativeScriptableShared key(flags, name, interfacesBitmap);
Entry* entry = (Entry*)
--- a/js/src/xpconnect/src/xpcprivate.h
+++ b/js/src/xpconnect/src/xpcprivate.h
@@ -781,17 +781,17 @@ public:
private:
JSDHashTable* DEBUG_WrappedNativeHashtable;
public:
#endif
void AddGCCallback(JSGCCallback cb);
void RemoveGCCallback(JSGCCallback cb);
- static void ActivityCallback(void *arg, PRBool active);
+ static void ActivityCallback(void *arg, JSBool active);
private:
XPCJSRuntime(); // no implementation
XPCJSRuntime(nsXPConnect* aXPConnect);
// The caller must be holding the GC lock
void RescheduleWatchdog(XPCContext* ccx);
--- a/js/src/xpconnect/src/xpcwrappednativejsops.cpp
+++ b/js/src/xpconnect/src/xpcwrappednativejsops.cpp
@@ -807,19 +807,21 @@ XPC_WN_Equality(JSContext *cx, JSObject
return JS_TRUE;
}
THROW_AND_RETURN_IF_BAD_WRAPPER(cx, wrapper);
XPCNativeScriptableInfo* si = wrapper->GetScriptableInfo();
if(si && si->GetFlags().WantEquality())
{
- nsresult rv = si->GetCallback()->Equality(wrapper, cx, obj, v, bp);
+ PRBool res;
+ nsresult rv = si->GetCallback()->Equality(wrapper, cx, obj, v, &res);
if(NS_FAILED(rv))
return Throw(rv, cx);
+ *bp = res;
}
else if(!JSVAL_IS_PRIMITIVE(v))
{
JSObject *other = JSVAL_TO_OBJECT(v);
*bp = (obj == other ||
XPC_GetIdentityObject(cx, obj) ==
XPC_GetIdentityObject(cx, other));
@@ -1060,18 +1062,20 @@ XPC_WN_Helper_Construct(JSContext *cx, u
Construct(wrapper, cx, obj, argc, JS_ARGV(cx, vp), vp, &retval);
POST_HELPER_STUB
}
static JSBool
XPC_WN_Helper_HasInstance(JSContext *cx, JSObject *obj, const jsval *valp, JSBool *bp)
{
SLIM_LOG_WILL_MORPH(cx, obj);
+ PRBool retval2;
PRE_HELPER_STUB_NO_SLIM
- HasInstance(wrapper, cx, obj, *valp, bp, &retval);
+ HasInstance(wrapper, cx, obj, *valp, &retval2, &retval);
+ *bp = retval2;
POST_HELPER_STUB
}
static void
XPC_WN_Helper_Finalize(JSContext *cx, JSObject *obj)
{
nsISupports* p = static_cast<nsISupports*>(xpc_GetJSPrivate(obj));
if(IS_SLIM_WRAPPER(obj))
@@ -1099,17 +1103,17 @@ XPC_WN_Helper_Trace(JSTracer *trc, JSObj
MarkWrappedNative(trc, obj, true);
}
static JSBool
XPC_WN_Helper_NewResolve(JSContext *cx, JSObject *obj, jsid id, uintN flags,
JSObject **objp)
{
nsresult rv = NS_OK;
- JSBool retval = JS_TRUE;
+ PRBool retval = JS_TRUE;
JSObject* obj2FromScriptable = nsnull;
if(IS_SLIM_WRAPPER(obj))
{
XPCNativeScriptableInfo *si =
GetSlimWrapperProto(obj)->GetScriptableInfo();
if(!si->GetFlags().WantNewResolve())
return retval;
--- a/js/src/xpconnect/wrappers/XrayWrapper.cpp
+++ b/js/src/xpconnect/wrappers/XrayWrapper.cpp
@@ -202,17 +202,17 @@ holder_get(JSContext *cx, JSObject *wrap
JSObject *holder = GetHolder(wrapper);
XPCWrappedNative *wn = GetWrappedNativeFromHolder(holder);
if (NATIVE_HAS_FLAG(wn, WantGetProperty)) {
JSAutoEnterCompartment ac;
if (!ac.enter(cx, holder))
return false;
- JSBool retval = true;
+ PRBool retval = true;
nsresult rv = wn->GetScriptableCallback()->GetProperty(wn, cx, wrapper, id, vp, &retval);
if (NS_FAILED(rv) || !retval) {
if (retval)
XPCThrower::Throw(rv, cx);
return false;
}
}
return true;
@@ -228,17 +228,17 @@ holder_set(JSContext *cx, JSObject *wrap
return true;
}
XPCWrappedNative *wn = GetWrappedNativeFromHolder(holder);
if (NATIVE_HAS_FLAG(wn, WantSetProperty)) {
JSAutoEnterCompartment ac;
if (!ac.enter(cx, holder))
return false;
- JSBool retval = true;
+ PRBool retval = true;
nsresult rv = wn->GetScriptableCallback()->SetProperty(wn, cx, wrapper, id, vp, &retval);
if (NS_FAILED(rv) || !retval) {
if (retval)
XPCThrower::Throw(rv, cx);
return false;
}
}
return true;
@@ -482,17 +482,17 @@ XrayWrapper<Base>::resolveOwnProperty(JS
XPCWrappedNative *wn = GetWrappedNativeFromHolder(holder);
// Run the resolve hook of the wrapped native.
if (!NATIVE_HAS_FLAG(wn, WantNewResolve)) {
desc->obj = nsnull;
return true;
}
- JSBool retval = true;
+ PRBool retval = true;
JSObject *pobj = NULL;
nsresult rv = wn->GetScriptableInfo()->GetCallback()->NewResolve(wn, cx, wrapper, id,
flags, &pobj, &retval);
if (NS_FAILED(rv)) {
if (retval)
XPCThrower::Throw(rv, cx);
return false;
}