Bug 1184564 part 2 - Use Value instead of jsval in dom/ and storage/. r=bz

This commit is contained in:
Jan de Mooij 2015-07-18 21:45:35 +02:00
parent a7ae949817
commit 17b86e4780
5 changed files with 12 additions and 12 deletions

View File

@ -902,7 +902,7 @@ nsDOMClassInfo::AddProperty(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
NS_IMETHODIMP NS_IMETHODIMP
nsDOMClassInfo::GetProperty(nsIXPConnectWrappedNative *wrapper, JSContext *cx, nsDOMClassInfo::GetProperty(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
JSObject *obj, jsid id, jsval *vp, JSObject *obj, jsid id, JS::Value *vp,
bool *_retval) bool *_retval)
{ {
NS_WARNING("nsDOMClassInfo::GetProperty Don't call me!"); NS_WARNING("nsDOMClassInfo::GetProperty Don't call me!");
@ -912,7 +912,7 @@ nsDOMClassInfo::GetProperty(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
NS_IMETHODIMP NS_IMETHODIMP
nsDOMClassInfo::SetProperty(nsIXPConnectWrappedNative *wrapper, JSContext *cx, nsDOMClassInfo::SetProperty(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
JSObject *obj, jsid id, jsval *vp, JSObject *obj, jsid id, JS::Value *vp,
bool *_retval) bool *_retval)
{ {
NS_WARNING("nsDOMClassInfo::SetProperty Don't call me!"); NS_WARNING("nsDOMClassInfo::SetProperty Don't call me!");
@ -1339,7 +1339,7 @@ public:
bool *_retval); bool *_retval);
nsresult HasInstance(nsIXPConnectWrappedNative *wrapper, JSContext *cx, nsresult HasInstance(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
JS::Handle<JSObject*> obj, const jsval &val, bool *bp, JS::Handle<JSObject*> obj, const JS::Value &val, bool *bp,
bool *_retval); bool *_retval);
nsresult ResolveInterfaceConstants(JSContext *cx, JS::Handle<JSObject*> obj); nsresult ResolveInterfaceConstants(JSContext *cx, JS::Handle<JSObject*> obj);
@ -1499,7 +1499,7 @@ nsDOMConstructor::Construct(nsIXPConnectWrappedNative *wrapper, JSContext * cx,
nsresult nsresult
nsDOMConstructor::HasInstance(nsIXPConnectWrappedNative *wrapper, nsDOMConstructor::HasInstance(nsIXPConnectWrappedNative *wrapper,
JSContext * cx, JS::Handle<JSObject*> obj, JSContext * cx, JS::Handle<JSObject*> obj,
const jsval &v, bool *bp, bool *_retval) const JS::Value &v, bool *bp, bool *_retval)
{ {
// No need to look these up in the hash. // No need to look these up in the hash.

View File

@ -340,7 +340,7 @@ public:
}; };
WorkerCrossThreadDispatcher* WorkerCrossThreadDispatcher*
GetWorkerCrossThreadDispatcher(JSContext* aCx, jsval aWorker); GetWorkerCrossThreadDispatcher(JSContext* aCx, JS::Value aWorker);
// Random unique constant to facilitate JSPrincipal debugging // Random unique constant to facilitate JSPrincipal debugging
const uint32_t kJSPrincipalsDebugToken = 0x7e2df9d2; const uint32_t kJSPrincipalsDebugToken = 0x7e2df9d2;

View File

@ -28,7 +28,7 @@ nsresult
AsyncStatementJSHelper::getParams(AsyncStatement *aStatement, AsyncStatementJSHelper::getParams(AsyncStatement *aStatement,
JSContext *aCtx, JSContext *aCtx,
JSObject *aScopeObj, JSObject *aScopeObj,
jsval *_params) JS::Value *_params)
{ {
MOZ_ASSERT(NS_IsMainThread()); MOZ_ASSERT(NS_IsMainThread());
nsresult rv; nsresult rv;
@ -91,7 +91,7 @@ AsyncStatementJSHelper::GetProperty(nsIXPConnectWrappedNative *aWrapper,
JSContext *aCtx, JSContext *aCtx,
JSObject *aScopeObj, JSObject *aScopeObj,
jsid aId, jsid aId,
jsval *_result, JS::Value *_result,
bool *_retval) bool *_retval)
{ {
if (!JSID_IS_STRING(aId)) if (!JSID_IS_STRING(aId))

View File

@ -29,7 +29,7 @@ static
bool bool
stepFunc(JSContext *aCtx, stepFunc(JSContext *aCtx,
uint32_t, uint32_t,
jsval *_vp) JS::Value *_vp)
{ {
nsCOMPtr<nsIXPConnect> xpc(Service::getXPConnect()); nsCOMPtr<nsIXPConnect> xpc(Service::getXPConnect());
nsCOMPtr<nsIXPConnectWrappedNative> wrapper; nsCOMPtr<nsIXPConnectWrappedNative> wrapper;
@ -82,7 +82,7 @@ nsresult
StatementJSHelper::getRow(Statement *aStatement, StatementJSHelper::getRow(Statement *aStatement,
JSContext *aCtx, JSContext *aCtx,
JSObject *aScopeObj, JSObject *aScopeObj,
jsval *_row) JS::Value *_row)
{ {
MOZ_ASSERT(NS_IsMainThread()); MOZ_ASSERT(NS_IsMainThread());
nsresult rv; nsresult rv;
@ -126,7 +126,7 @@ nsresult
StatementJSHelper::getParams(Statement *aStatement, StatementJSHelper::getParams(Statement *aStatement,
JSContext *aCtx, JSContext *aCtx,
JSObject *aScopeObj, JSObject *aScopeObj,
jsval *_params) JS::Value *_params)
{ {
MOZ_ASSERT(NS_IsMainThread()); MOZ_ASSERT(NS_IsMainThread());
nsresult rv; nsresult rv;
@ -190,7 +190,7 @@ StatementJSHelper::GetProperty(nsIXPConnectWrappedNative *aWrapper,
JSContext *aCtx, JSContext *aCtx,
JSObject *aScopeObj, JSObject *aScopeObj,
jsid aId, jsid aId,
jsval *_result, JS::Value *_result,
bool *_retval) bool *_retval)
{ {
if (!JSID_IS_STRING(aId)) if (!JSID_IS_STRING(aId))

View File

@ -44,7 +44,7 @@ StatementRow::GetProperty(nsIXPConnectWrappedNative *aWrapper,
JSContext *aCtx, JSContext *aCtx,
JSObject *aScopeObj, JSObject *aScopeObj,
jsid aId, jsid aId,
jsval *_vp, JS::Value *_vp,
bool *_retval) bool *_retval)
{ {
NS_ENSURE_TRUE(mStatement, NS_ERROR_NOT_INITIALIZED); NS_ENSURE_TRUE(mStatement, NS_ERROR_NOT_INITIALIZED);