wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 952650 (part 1) - Remove JSVAL_IS_NULL. r=terrence.

Browse Source 
--HG--
extra : rebase_source : 83d1cdaf71260fd99b688c23303ceb2de7b00031
This commit is contained in:
Rodrigo Rodriguez Jr. 2014-04-27 19:30:51 -07:00
parent c8d7614371
commit 413ffc41d6
19 changed files with 31 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
content/canvas/src/CanvasUtils.h
View File

@ -141,7 +141,7 @@ JSValToDashArray(JSContext* cx, const JS::Value& patternArray,
// An all-zero pattern makes no sense.
return NS_ERROR_ILLEGAL_VALUE;
}
} else if (!(JSVAL_IS_VOID(patternArray) || JSVAL_IS_NULL(patternArray))) {
} else if (!(JSVAL_IS_VOID(patternArray) || patternArray.isNull())) {
// undefined and null mean "reset to no dash". Any other
// random garbage is a type error.
return NS_ERROR_INVALID_ARG;

2
dom/base/nsDOMClassInfo.cpp
View File

@ -3034,7 +3034,7 @@ nsWindowSH::GlobalResolve(nsGlobalWindow *aWin, JSContext *cx,
NS_ENSURE_SUCCESS(rv, rv);
}
if (JSVAL_IS_PRIMITIVE(prop_val) && !JSVAL_IS_NULL(prop_val)) {
if (JSVAL_IS_PRIMITIVE(prop_val) && !prop_val.isNull()) {
if (aWin->IsOuterWindow()) {
nsGlobalWindow *inner = aWin->GetCurrentInnerWindowInternal();
NS_ENSURE_TRUE(inner, NS_ERROR_UNEXPECTED);

2
dom/indexedDB/KeyPath.cpp
View File

@ -301,7 +301,7 @@ KeyPath::Parse(JSContext* aCx, const JS::Value& aValue_, KeyPath* aKeyPath)
}
}
// Otherwise convert it to a string.
else if (!JSVAL_IS_NULL(aValue) && !JSVAL_IS_VOID(aValue)) {
else if (!aValue.isNull() && !JSVAL_IS_VOID(aValue)) {
JSString* jsstr;
nsDependentJSString str;
if (!(jsstr = JS::ToString(aCx, aValue)) ||

2
dom/plugins/base/nsJSNPRuntime.cpp
View File

@ -384,7 +384,7 @@ JSValToNPVariant(NPP npp, JSContext *cx, JS::Value val, NPVariant *variant)
if (JSVAL_IS_PRIMITIVE(val)) {
if (val == JSVAL_VOID) {
VOID_TO_NPVARIANT(*variant);
} else if (JSVAL_IS_NULL(val)) {
} else if (val.isNull()) {
NULL_TO_NPVARIANT(*variant);
} else if (JSVAL_IS_BOOLEAN(val)) {
BOOLEAN_TO_NPVARIANT(JSVAL_TO_BOOLEAN(val), *variant);

2
dom/workers/XMLHttpRequest.cpp
View File

@ -1256,7 +1256,7 @@ EventRunnable::WorkerRun(JSContext* aCx, WorkerPrivate* aWorkerPrivate)
state->mResponseText = mResponseText;
if (NS_SUCCEEDED(mResponseTextResult)) {
MOZ_ASSERT(JSVAL_IS_VOID(mResponse) || JSVAL_IS_NULL(mResponse));
MOZ_ASSERT(JSVAL_IS_VOID(mResponse) || mResponse.isNull());
state->mResponseResult = mResponseTextResult;
state->mResponse = mResponse;
}

4
js/jsd/jsd_val.cpp
View File

@ -60,7 +60,7 @@ void JSD_ASSERT_VALID_PROPERTY(JSDProperty* jsdprop)
bool
jsd_IsValueObject(JSDContext* jsdc, JSDValue* jsdval)
{
return !JSVAL_IS_PRIMITIVE(jsdval->val) || JSVAL_IS_NULL(jsdval->val);
return !JSVAL_IS_PRIMITIVE(jsdval->val) || jsdval->val.isNull();
}
bool
@ -96,7 +96,7 @@ jsd_IsValueBoolean(JSDContext* jsdc, JSDValue* jsdval)
bool
jsd_IsValueNull(JSDContext* jsdc, JSDValue* jsdval)
{
return JSVAL_IS_NULL(jsdval->val);
return jsdval->val.isNull();
}
bool

2
js/jsd/jsd_xpc.cpp
View File

@ -2158,7 +2158,7 @@ jsdValue::GetJsType (uint32_t *_rval)
ASSERT_VALID_EPHEMERAL;
JS::RootedValue val(JSD_GetJSRuntime(mCx), JSD_GetValueWrappedJSVal (mCx, mValue));
if (JSVAL_IS_NULL(val))
if (val.isNull())
*_rval = TYPE_NULL;
else if (JSVAL_IS_BOOLEAN(val))
*_rval = TYPE_BOOLEAN;

6
js/public/Value.h
View File

@ -1821,12 +1821,6 @@ static_assert(sizeof(jsval_layout) == sizeof(JS::Value),
/************************************************************************/
static inline bool
JSVAL_IS_NULL(jsval v)
{
return JSVAL_IS_NULL_IMPL(JSVAL_TO_IMPL(v));
}
static inline bool
JSVAL_IS_VOID(jsval v)
{

4
js/src/ctypes/CTypes.cpp
View File

@ -2328,7 +2328,7 @@ ImplicitConvert(JSContext* cx,
}
#include "ctypes/typedefs.h"
case TYPE_pointer: {
if (JSVAL_IS_NULL(val)) {
if (val.isNull()) {
// Convert to a null pointer.
*static_cast<void**>(buffer) = nullptr;
break;
@ -4366,7 +4366,7 @@ ArrayType::GetBaseType(JSObject* obj)
JS_ASSERT(CType::GetTypeCode(obj) == TYPE_array);
jsval type = JS_GetReservedSlot(obj, SLOT_ELEMENT_T);
JS_ASSERT(!JSVAL_IS_NULL(type));
JS_ASSERT(!type.isNull());
return &type.toObject();
}

2
js/src/jsapi-tests/testResolveRecursion.cpp
View File

@ -123,7 +123,7 @@ doResolve(JS::HandleObject obj, JS::HandleId id, JS::MutableHandleObject objp)
EVAL("obj1.y", &v);
CHECK(JSVAL_IS_VOID(v));
EVAL("obj2.y", &v);
CHECK(JSVAL_IS_NULL(v));
CHECK(v.isNull());
EVAL("obj2.x", &v);
CHECK(JSVAL_IS_VOID(v));
EVAL("obj1.y = 0", &v);

2
js/src/tests/js1_5/Regress/regress-355829-01.js
View File

@ -5,7 +5,7 @@
//-----------------------------------------------------------------------------
var BUGNUMBER = 355829;
var summary = 'Do not assert: !argc || JSVAL_IS_NULL(argv[0]) || JSVAL_IS_VOID(argv[0])';
var summary = 'Do not assert: !argc || argv[0].isNull() || JSVAL_IS_VOID(argv[0])';
var actual = '';
var expect = '';

2
js/src/vm/Probes.cpp
View File

@ -12,7 +12,7 @@
#include "jsscriptinlines.h"
#endif
#define TYPEOF(cx,v) (JSVAL_IS_NULL(v) ? JSTYPE_NULL : JS_TypeOfValue(cx,v))
#define TYPEOF(cx,v) (v.isNull() ? JSTYPE_NULL : JS_TypeOfValue(cx,v))
using namespace js;

2
js/src/vm/StructuredClone.cpp
View File

@ -719,7 +719,7 @@ JSStructuredCloneWriter::parseTransferable()
{
MOZ_ASSERT(transferableObjects.empty(), "parseTransferable called with stale data");
if (JSVAL_IS_NULL(transferable) || JSVAL_IS_VOID(transferable))
if (transferable.isNull() || JSVAL_IS_VOID(transferable))
return true;
if (!transferable.isObject())

2
js/xpconnect/public/nsAutoJSValHolder.h
View File

@ -117,7 +117,7 @@ public:
nsAutoJSValHolder &operator=(JS::Value aOther) {
#ifdef DEBUG
if (JSVAL_IS_GCTHING(aOther) && !JSVAL_IS_NULL(aOther)) {
if (JSVAL_IS_GCTHING(aOther) && !aOther.isNull()) {
MOZ_ASSERT(IsHeld(), "Not rooted!");
}
#endif

18
js/xpconnect/src/XPCConvert.cpp
View File

@ -484,7 +484,7 @@ XPCConvert::JSData2Native(void* d, HandleValue s,
}
case nsXPTType::T_DOMSTRING:
{
if (JSVAL_IS_NULL(s)) {
if (s.isNull()) {
if (useAllocator)
*((const nsAString**)d) = &NullString();
else
@ -543,7 +543,7 @@ XPCConvert::JSData2Native(void* d, HandleValue s,
case nsXPTType::T_CHAR_STR:
{
if (JSVAL_IS_VOID(s) || JSVAL_IS_NULL(s)) {
if (JSVAL_IS_VOID(s) || s.isNull()) {
*((char**)d) = nullptr;
return true;
}
@ -584,7 +584,7 @@ XPCConvert::JSData2Native(void* d, HandleValue s,
const jschar* chars=nullptr;
JSString* str;
if (JSVAL_IS_VOID(s) || JSVAL_IS_NULL(s)) {
if (JSVAL_IS_VOID(s) || s.isNull()) {
*((jschar**)d) = nullptr;
return true;
}
@ -614,7 +614,7 @@ XPCConvert::JSData2Native(void* d, HandleValue s,
size_t length;
JSString* str;
if (JSVAL_IS_NULL(s) || JSVAL_IS_VOID(s)) {
if (s.isNull() || JSVAL_IS_VOID(s)) {
if (useAllocator) {
*((const nsACString**)d) = &NullCString();
} else {
@ -658,7 +658,7 @@ XPCConvert::JSData2Native(void* d, HandleValue s,
case nsXPTType::T_CSTRING:
{
if (JSVAL_IS_NULL(s) || JSVAL_IS_VOID(s)) {
if (s.isNull() || JSVAL_IS_VOID(s)) {
if (useAllocator) {
nsACString *rs = new nsCString();
if (!rs)
@ -1211,7 +1211,7 @@ XPCConvert::JSValToXPCException(MutableHandleValue s,
}
}
if (JSVAL_IS_VOID(s) || JSVAL_IS_NULL(s)) {
if (JSVAL_IS_VOID(s) || s.isNull()) {
return ConstructException(NS_ERROR_XPC_JS_THREW_NULL,
nullptr, ifaceName, methodName, nullptr,
exceptn, cx, s.address());
@ -1759,7 +1759,7 @@ XPCConvert::JSStringWithSize2Native(void* d, HandleValue s,
uint32_t count, const nsXPTType& type,
nsresult* pErr)
{
NS_PRECONDITION(!JSVAL_IS_NULL(s), "bad param");
NS_PRECONDITION(!s.isNull(), "bad param");
NS_PRECONDITION(d, "bad param");
AutoJSContext cx;
@ -1771,7 +1771,7 @@ XPCConvert::JSStringWithSize2Native(void* d, HandleValue s,
switch (type.TagPart()) {
case nsXPTType::T_PSTRING_SIZE_IS:
{
if (JSVAL_IS_VOID(s) || JSVAL_IS_NULL(s)) {
if (JSVAL_IS_VOID(s) || s.isNull()) {
if (0 != count) {
if (pErr)
*pErr = NS_ERROR_XPC_NOT_ENOUGH_CHARS_IN_STRING;
@ -1825,7 +1825,7 @@ XPCConvert::JSStringWithSize2Native(void* d, HandleValue s,
const jschar* chars=nullptr;
JSString* str;
if (JSVAL_IS_VOID(s) || JSVAL_IS_NULL(s)) {
if (JSVAL_IS_VOID(s) || s.isNull()) {
if (0 != count) {
if (pErr)
*pErr = NS_ERROR_XPC_NOT_ENOUGH_CHARS_IN_STRING;

4
js/xpconnect/src/XPCQuickStubs.h
View File

@ -224,7 +224,7 @@ protected:
* without doing anything else. Otherwise, the JSString* created
* from |v| will be returned. It'll be rooted, as needed, in
* *pval. nullBehavior and undefinedBehavior control what happens
* when |v| is JSVAL_IS_NULL and JSVAL_IS_VOID respectively.
* when v.isNull() and JSVAL_IS_VOID are respectively true.
*/
template<class traits>
JSString* InitOrStringify(JSContext* cx, JS::HandleValue v,
@ -237,7 +237,7 @@ protected:
s = JSVAL_TO_STRING(v);
} else {
StringificationBehavior behavior = eStringify;
if (JSVAL_IS_NULL(v)) {
if (v.isNull()) {
behavior = nullBehavior;
} else if (JSVAL_IS_VOID(v)) {
behavior = undefinedBehavior;

2
js/xpconnect/src/XPCVariant.cpp
View File

@ -63,7 +63,7 @@ XPCTraceableVariant::~XPCTraceableVariant()
if (!JSVAL_IS_STRING(val))
nsVariant::Cleanup(&mData);
if (!JSVAL_IS_NULL(val))
if (!val.isNull())
RemoveFromRootSet();
}

4
security/manager/ssl/src/nsCrypto.cpp
View File

@ -946,7 +946,7 @@ cryptojs_ReadArgsAndGenerateKey(JSContext *cx,
return NS_ERROR_FAILURE;
}
keySize = JSVAL_TO_INT(argv[0]);
if (!JSVAL_IS_NULL(argv[1])) {
if (!argv[1].isNull()) {
JS::Rooted<JS::Value> v(cx, argv[1]);
jsString = JS::ToString(cx, v);
NS_ENSURE_TRUE(jsString, NS_ERROR_OUT_OF_MEMORY);
@ -955,7 +955,7 @@ cryptojs_ReadArgsAndGenerateKey(JSContext *cx,
NS_ENSURE_TRUE(!!params, NS_ERROR_OUT_OF_MEMORY);
}
if (JSVAL_IS_NULL(argv[2])) {
if (argv[2].isNull()) {
JS_ReportError(cx,"%s%s", JS_ERROR,
"key generation type not specified");
return NS_ERROR_FAILURE;

4
toolkit/components/places/History.cpp
View File

@ -316,13 +316,13 @@ GetJSValueAsString(JSContext* aCtx,
const JS::Value& aValue,
nsString& _string) {
if (JSVAL_IS_VOID(aValue) ||
!(JSVAL_IS_NULL(aValue) || JSVAL_IS_STRING(aValue))) {
!(aValue.isNull() || JSVAL_IS_STRING(aValue))) {
_string.SetIsVoid(true);
return;
}
// |null| in JS maps to the empty string.
if (JSVAL_IS_NULL(aValue)) {
if (aValue.isNull()) {
_string.Truncate();
return;
}