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 687683: Remove unnecessary 'js::' namespace prefixes from Debugger code. r=jorendorff

Browse Source
This commit is contained in:
Jim Blandy 2011-12-06 11:40:27 -08:00
parent 0d213831b1
commit b0a215ceb7
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -164,7 +164,7 @@ BreakpointSite::recompile(JSContext *cx, bool forTrap)
if (!ac.ref().enter())
return false;
}
js::mjit::Recompiler recompiler(cx, script);
mjit::Recompiler recompiler(cx, script);
recompiler.recompile();
}
#endif
@ -756,7 +756,7 @@ Debugger::fireNewScript(JSContext *cx, JSScript *script)
}
JSTrapStatus
Debugger::dispatchHook(JSContext *cx, js::Value *vp, Hook which)
Debugger::dispatchHook(JSContext *cx, Value *vp, Hook which)
{
JS_ASSERT(which == OnDebuggerStatement || which == OnExceptionUnwind);
@ -1021,7 +1021,7 @@ Debugger::markKeysInCompartment(JSTracer *tracer)
for (ObjectMap::Range r = objStorage.all(); !r.empty(); r.popFront()) {
const HeapPtrObject &key = r.front().key;
if (key->compartment() == comp && IsAboutToBeFinalized(tracer->context, key))
js::gc::MarkObject(tracer, key, "cross-compartment WeakMap key");
gc::MarkObject(tracer, key, "cross-compartment WeakMap key");
}
typedef HashMap<HeapPtrScript, HeapPtrObject, DefaultHasher<HeapPtrScript>, RuntimeAllocPolicy>
@ -1030,7 +1030,7 @@ Debugger::markKeysInCompartment(JSTracer *tracer)
for (ScriptMap::Range r = scriptStorage.all(); !r.empty(); r.popFront()) {
const HeapPtrScript &key = r.front().key;
if (key->compartment() == comp && IsAboutToBeFinalized(tracer->context, key))
js::gc::MarkScript(tracer, key, "cross-compartment WeakMap key");
gc::MarkScript(tracer, key, "cross-compartment WeakMap key");
}
}
@ -1717,13 +1717,13 @@ Debugger::removeDebuggeeGlobal(JSContext *cx, GlobalObject *global,
* FIXME Debugger::slowPathOnLeaveFrame needs to kill all Debugger.Frame
* objects referring to a particular js::StackFrame. This is hard if
* Debugger objects that are no longer debugging the relevant global might
* have live Frame objects. So we take the easy way out and kill them
* here. This is a bug, since it's observable and contrary to the spec. One
* have live Frame objects. So we take the easy way out and kill them here.
* This is a bug, since it's observable and contrary to the spec. One
* possible fix would be to put such objects into a compartment-wide bag
* which slowPathOnLeaveFrame would have to examine.
*/
for (FrameMap::Enum e(frames); !e.empty(); e.popFront()) {
js::StackFrame *fp = e.front().key;
StackFrame *fp = e.front().key;
if (fp->scopeChain().getGlobal() == global) {
e.front().value->setPrivate(NULL);
e.removeFront();

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

@ -57,7 +57,7 @@
namespace js {
class Debugger {
friend class js::Breakpoint;
friend class Breakpoint;
friend JSBool (::JS_DefineDebuggerObject)(JSContext *cx, JSObject *obj);
public:
@ -203,7 +203,7 @@ class Debugger {
static void slowPathOnLeaveFrame(JSContext *cx);
static void slowPathOnNewScript(JSContext *cx, JSScript *script,
GlobalObject *compileAndGoGlobal);
static JSTrapStatus dispatchHook(JSContext *cx, js::Value *vp, Hook which);
static JSTrapStatus dispatchHook(JSContext *cx, Value *vp, Hook which);
JSTrapStatus fireDebuggerStatement(JSContext *cx, Value *vp);
JSTrapStatus fireExceptionUnwind(JSContext *cx, Value *vp);
@ -258,8 +258,8 @@ class Debugger {
static inline void onEnterFrame(JSContext *cx);
static inline void onLeaveFrame(JSContext *cx);
static inline JSTrapStatus onDebuggerStatement(JSContext *cx, js::Value *vp);
static inline JSTrapStatus onExceptionUnwind(JSContext *cx, js::Value *vp);
static inline JSTrapStatus onDebuggerStatement(JSContext *cx, Value *vp);
static inline JSTrapStatus onExceptionUnwind(JSContext *cx, Value *vp);
static inline void onNewScript(JSContext *cx, JSScript *script,
GlobalObject *compileAndGoGlobal);
static JSTrapStatus onTrap(JSContext *cx, Value *vp);
@ -343,9 +343,9 @@ class Debugger {
};
class BreakpointSite {
friend class js::Breakpoint;
friend class Breakpoint;
friend struct ::JSCompartment;
friend class js::Debugger;
friend class Debugger;
public:
JSScript * const script;
@ -402,7 +402,7 @@ class BreakpointSite {
*/
class Breakpoint {
friend struct ::JSCompartment;
friend class js::Debugger;
friend class Debugger;
public:
Debugger * const debugger;
@ -490,7 +490,7 @@ Debugger::onLeaveFrame(JSContext *cx)
}
JSTrapStatus
Debugger::onDebuggerStatement(JSContext *cx, js::Value *vp)
Debugger::onDebuggerStatement(JSContext *cx, Value *vp)
{
return cx->compartment->getDebuggees().empty()
? JSTRAP_CONTINUE
@ -498,7 +498,7 @@ Debugger::onDebuggerStatement(JSContext *cx, js::Value *vp)
}
JSTrapStatus
Debugger::onExceptionUnwind(JSContext *cx, js::Value *vp)
Debugger::onExceptionUnwind(JSContext *cx, Value *vp)
{
return cx->compartment->getDebuggees().empty()
? JSTRAP_CONTINUE