Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-27 15:55:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 828244 - Part d: Pass MutableHandleValue to Debugger::wrapEnvironment; r=terrence

Browse Source
This commit is contained in:
Ms2ger 2013-01-11 09:42:59 +01:00
parent 7451c1d4fd
commit 6a1dde9e8b
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
js/src/vm/Debugger.cpp
View File

@ -620,10 +620,10 @@ Debugger::slowPathOnLeaveFrame(JSContext *cx, bool frameOk)
}
bool
Debugger::wrapEnvironment(JSContext *cx, Handle<Env*> env, Value *rval)
Debugger::wrapEnvironment(JSContext *cx, Handle<Env*> env, MutableHandleValue rval)
{
if (!env) {
rval->setNull();
rval.setNull();
return true;
}
@ -657,7 +657,7 @@ Debugger::wrapEnvironment(JSContext *cx, Handle<Env*> env, Value *rval)
return false;
}
}
rval->setObject(*envobj);
rval.setObject(*envobj);
return true;
}
@ -3326,7 +3326,7 @@ DebuggerFrame_getEnvironment(JSContext *cx, unsigned argc, Value *vp)
return false;
}
return dbg->wrapEnvironment(cx, env, args.rval().address());
return dbg->wrapEnvironment(cx, env, args.rval());
}
static JSBool
@ -4073,7 +4073,7 @@ DebuggerObject_getEnvironment(JSContext *cx, unsigned argc, Value *vp)
return false;
}
return dbg->wrapEnvironment(cx, env, args.rval().address());
return dbg->wrapEnvironment(cx, env, args.rval());
}
static JSBool
@ -4717,7 +4717,7 @@ DebuggerEnv_getParent(JSContext *cx, unsigned argc, Value *vp)
/* Don't bother switching compartments just to get env's parent. */
Rooted<Env*> parent(cx, env->enclosingScope());
return dbg->wrapEnvironment(cx, parent, args.rval().address());
return dbg->wrapEnvironment(cx, parent, args.rval());
}
static JSBool
@ -4830,7 +4830,7 @@ DebuggerEnv_find(JSContext *cx, unsigned argc, Value *vp)
}
}
return dbg->wrapEnvironment(cx, env, args.rval().address());
return dbg->wrapEnvironment(cx, env, args.rval());
}
static JSBool

2
js/src/vm/Debugger.h
View File

@ -411,7 +411,7 @@ class Debugger : private mozilla::LinkedListElement<Debugger>
* create a Debugger.Environment object for the given Env. On success,
* store the Environment object in *vp and return true.
*/
bool wrapEnvironment(JSContext *cx, Handle<Env*> env, Value *vp);
bool wrapEnvironment(JSContext *cx, Handle<Env*> env, MutableHandleValue vp);
/*
* Like cx->compartment->wrap(cx, vp), but for the debugger compartment.