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 867350 - remove JS_UnwrapObject and JS_UnwrapObjectAndInnerize from jsdbgapi.h r=sfink

Browse Source
This commit is contained in:
Andrew McCreight 2013-05-01 09:19:18 -07:00
parent ed5a234421
commit 0d25779643
5 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
js/ductwork/debugger/JSDebugger.cpp
View File

@ -9,6 +9,7 @@
#include "jsapi.h"
#include "jsfriendapi.h"
#include "jsdbgapi.h"
#include "jswrapper.h"
#include "mozilla/ModuleUtils.h"
#include "nsServiceManagerUtils.h"
#include "nsMemory.h"
@ -45,7 +46,7 @@ JSDebugger::AddClass(const JS::Value &global, JSContext* cx)
}
JSObject* obj = &global.toObject();
obj = JS_UnwrapObjectAndInnerize(obj);
obj = js::UncheckedUnwrap(obj, /* stopAtOuter = */ false);
if (!obj) {
return NS_ERROR_FAILURE;
}

3
js/jsd/jsd_val.cpp
View File

@ -11,6 +11,7 @@
#include "jsd.h"
#include "jsapi.h"
#include "jsfriendapi.h"
#include "jswrapper.h"
#ifdef DEBUG
void JSD_ASSERT_VALID_VALUE(JSDValue* jsdval)
@ -605,7 +606,7 @@ jsd_GetValueFunction(JSDContext* jsdc, JSDValue* jsdval)
if (JSVAL_IS_PRIMITIVE(jsdval->val))
return NULL;
obj = JS_UnwrapObject(JSVAL_TO_OBJECT(jsdval->val));
obj = js::UncheckedUnwrap(JSVAL_TO_OBJECT(jsdval->val));
oldCompartment = JS_EnterCompartment(jsdc->dumbContext, obj);
fun = JS_ValueToFunction(jsdc->dumbContext, OBJECT_TO_JSVAL(obj));
JS_LeaveCompartment(jsdc->dumbContext, oldCompartment);

12
js/src/jsdbgapi.cpp
View File

@ -951,18 +951,6 @@ JS_DumpCompartmentPCCounts(JSContext *cx)
#endif
}
JS_PUBLIC_API(JSObject *)
JS_UnwrapObject(JSObject *obj)
{
return UncheckedUnwrap(obj);
}
JS_PUBLIC_API(JSObject *)
JS_UnwrapObjectAndInnerize(JSObject *obj)
{
return UncheckedUnwrap(obj, /* stopAtOuter = */ false);
}
JS_FRIEND_API(JSBool)
js_CallContextDebugHandler(JSContext *cx)
{

6
js/src/jsdbgapi.h
View File

@ -461,12 +461,6 @@ JS_DumpPCCounts(JSContext *cx, JSScript *script);
extern JS_PUBLIC_API(void)
JS_DumpCompartmentPCCounts(JSContext *cx);
extern JS_PUBLIC_API(JSObject *)
JS_UnwrapObject(JSObject *obj);
extern JS_PUBLIC_API(JSObject *)
JS_UnwrapObjectAndInnerize(JSObject *obj);
/* Call the context debug handler on the topmost scripted frame. */
extern JS_FRIEND_API(JSBool)
js_CallContextDebugHandler(JSContext *cx);

2
js/src/shell/js.cpp
View File

@ -984,7 +984,7 @@ Evaluate(JSContext *cx, unsigned argc, jsval *vp)
if (!JSVAL_IS_VOID(v)) {
global = JSVAL_IS_PRIMITIVE(v) ? NULL : JSVAL_TO_OBJECT(v);
if (global) {
global = JS_UnwrapObject(global);
global = js::UncheckedUnwrap(global);
if (!global)
return false;
}