Bustage fix, bug 947014 followup. r=bustage in a CLOSED TREE

This commit is contained in:
Jeff Walden 2014-01-29 17:57:36 -08:00
parent 423f6f24e5
commit ee9851c473

View File

@ -33,9 +33,7 @@ class MOZ_STACK_CLASS WrapperOptions : public ProxyOptions {
proto_.construct(cx);
}
JSObject *proto() const {
return proto_.empty() ? Wrapper::defaultProto : proto_.ref();
}
inline JSObject *proto() const;
WrapperOptions &setProto(JSObject *protoArg) {
JS_ASSERT(!proto_.empty());
proto_.ref() = protoArg;
@ -95,6 +93,12 @@ class JS_FRIEND_API(Wrapper) : public DirectProxyHandler
static JSObject *defaultProto;
};
inline JSObject *
WrapperOptions::proto() const
{
return proto_.empty() ? Wrapper::defaultProto : proto_.ref();
}
/* Base class for all cross compartment wrapper handlers. */
class JS_FRIEND_API(CrossCompartmentWrapper) : public Wrapper
{