mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 889714 - Remove ContextCallback junk. r=mrbkap
There's no reason we should be doing this.
This commit is contained in:
parent
88bc5ce8d9
commit
c7c71460a4
@ -86,21 +86,6 @@ Environment(JSObject* global)
|
|||||||
return static_cast<XPCShellEnvironment*>(v.get().toPrivate());
|
return static_cast<XPCShellEnvironment*>(v.get().toPrivate());
|
||||||
}
|
}
|
||||||
|
|
||||||
JSContextCallback gOldContextCallback = NULL;
|
|
||||||
|
|
||||||
static JSBool
|
|
||||||
ContextCallback(JSContext *cx,
|
|
||||||
unsigned contextOp)
|
|
||||||
{
|
|
||||||
if (gOldContextCallback && !gOldContextCallback(cx, contextOp))
|
|
||||||
return JS_FALSE;
|
|
||||||
|
|
||||||
if (contextOp == JSCONTEXT_NEW) {
|
|
||||||
JS_SetErrorReporter(cx, xpc::SystemErrorReporter);
|
|
||||||
}
|
|
||||||
return JS_TRUE;
|
|
||||||
}
|
|
||||||
|
|
||||||
static JSBool
|
static JSBool
|
||||||
Print(JSContext *cx,
|
Print(JSContext *cx,
|
||||||
unsigned argc,
|
unsigned argc,
|
||||||
@ -585,12 +570,6 @@ XPCShellEnvironment::~XPCShellEnvironment()
|
|||||||
|
|
||||||
JSRuntime *rt = JS_GetRuntime(cx);
|
JSRuntime *rt = JS_GetRuntime(cx);
|
||||||
JS_GC(rt);
|
JS_GC(rt);
|
||||||
|
|
||||||
if (gOldContextCallback) {
|
|
||||||
NS_ASSERTION(rt, "Should never be null!");
|
|
||||||
JS_SetContextCallback(rt, gOldContextCallback);
|
|
||||||
gOldContextCallback = NULL;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -623,7 +602,6 @@ XPCShellEnvironment::Init()
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
gOldContextCallback = JS_SetContextCallback(rt, ContextCallback);
|
|
||||||
AutoSafeJSContext cx;
|
AutoSafeJSContext cx;
|
||||||
|
|
||||||
JS_SetContextPrivate(cx, this);
|
JS_SetContextPrivate(cx, this);
|
||||||
|
Loading…
Reference in New Issue
Block a user