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 865964. Remove dead WrapCallbackInterface code. r=smaug

Browse Source
This commit is contained in:
Boris Zbarsky 2013-04-26 13:41:21 -04:00
parent 7beee2619e
commit e31b7dba18
3 changed files with 1 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dom/bindings/BindingUtils.cpp
View File

@ -1259,19 +1259,6 @@ HasPropertyOnPrototype(JSContext* cx, JSObject* proxy, DOMProxyHandler* handler,
return !GetPropertyOnPrototype(cx, proxy, id, &found, NULL) || found;
}
bool
WrapCallbackInterface(JSContext *cx, JSObject *scope, nsISupports* callback,
JS::Value* vp)
{
nsCOMPtr<nsIXPConnectWrappedJS> wrappedJS = do_QueryInterface(callback);
MOZ_ASSERT(wrappedJS, "How can we not have an XPCWrappedJS here?");
JSObject* obj;
DebugOnly<nsresult> rv = wrappedJS->GetJSObject(&obj);
MOZ_ASSERT(NS_SUCCEEDED(rv) && obj, "What are we wrapping?");
*vp = JS::ObjectValue(*obj);
return JS_WrapValue(cx, vp);
}
JSObject*
GetXrayExpandoChain(JSObject* obj)
{

20
dom/bindings/BindingUtils.h
View File

@ -1002,26 +1002,6 @@ WrapObject(JSContext* cx, JSObject* scope, JSObject& p, JS::Value* vp)
return true;
}
bool
WrapCallbackInterface(JSContext *cx, JSObject *scope, nsISupports* callback,
JS::Value* vp);
static inline bool
WrapCallbackInterface(JSContext *cx, JSObject *scope, nsISupports& callback,
JS::Value* vp)
{
return WrapCallbackInterface(cx, scope, &callback, vp);
}
// Helper for smart pointers (nsAutoPtr/nsRefPtr/nsCOMPtr).
template <template <typename> class SmartPtr, class T>
inline bool
WrapCallbackInterface(JSContext* cx, JSObject* scope, const SmartPtr<T>& value,
JS::Value* vp)
{
return WrapCallbackInterface(cx, scope, value.get(), vp);
}
// Given an object "p" that inherits from nsISupports, wrap it and return the
// result. Null is returned on wrapping failure. This is somewhat similar to
// WrapObject() above, but does NOT allow Xrays around the result, since we

5
dom/bindings/Codegen.py
View File

@ -3622,10 +3622,7 @@ if (!returnArray) {
else:
wrappingCode = ""
if descriptor.interface.isCallback():
wrap = "WrapCallbackInterface(cx, ${obj}, %s, ${jsvalPtr})" % result
failed = None
elif not descriptor.interface.isExternal() and not descriptor.skipGen:
if not descriptor.interface.isExternal() and not descriptor.skipGen:
if descriptor.wrapperCache:
assert descriptor.nativeOwnership != 'owned'
wrapMethod = "WrapNewBindingObject"