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 855136 - Don't require call/construct args to NewProxyObject (r=luke)

Browse Source
This commit is contained in:
Bill McCloskey 2013-03-26 17:51:55 -07:00
parent 2e138c3f9f
commit 9f508d5cb7
4 changed files with 39 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
js/src/jsproxy.cpp
View File

@ -3213,19 +3213,16 @@ JS_FRIEND_DATA(Class) js::FunctionProxyClass = {
static JSObject *
NewProxyObject(JSContext *cx, BaseProxyHandler *handler, const Value &priv_, TaggedProto proto_,
JSObject *parent_, JSObject *call_, JSObject *construct_)
JSObject *parent_, ProxyCallable callable)
{
RootedValue priv(cx, priv_);
Rooted<TaggedProto> proto(cx, proto_);
RootedObject parent(cx, parent_), call(cx, call_), construct(cx, construct_);
RootedObject parent(cx, parent_);
JS_ASSERT_IF(proto.isObject(), cx->compartment == proto.toObject()->compartment());
JS_ASSERT_IF(parent, cx->compartment == parent->compartment());
JS_ASSERT_IF(construct, cx->compartment == construct->compartment());
JS_ASSERT_IF(call && cx->compartment != call->compartment(), priv.get() == ObjectValue(*call));
bool fun = call || construct;
Class *clasp;
if (fun)
if (callable)
clasp = &FunctionProxyClass;
else
clasp = handler->isOuterWindow() ? &OuterWindowProxyClass : &ObjectProxyClass;
@ -3250,12 +3247,6 @@ NewProxyObject(JSContext *cx, BaseProxyHandler *handler, const Value &priv_, Tag
return NULL;
obj->initSlot(JSSLOT_PROXY_HANDLER, PrivateValue(handler));
obj->initCrossCompartmentSlot(JSSLOT_PROXY_PRIVATE, priv);
if (fun) {
obj->initCrossCompartmentSlot(JSSLOT_PROXY_CALL, call ? ObjectValue(*call) : UndefinedValue());
if (construct) {
obj->initSlot(JSSLOT_PROXY_CONSTRUCT, ObjectValue(*construct));
}
}
/* Don't track types of properties of proxies. */
if (newKind != SingletonObject)
@ -3266,9 +3257,29 @@ NewProxyObject(JSContext *cx, BaseProxyHandler *handler, const Value &priv_, Tag
JS_FRIEND_API(JSObject *)
js::NewProxyObject(JSContext *cx, BaseProxyHandler *handler, const Value &priv_, JSObject *proto_,
JSObject *parent_, JSObject *call_, JSObject *construct_)
JSObject *parent_, ProxyCallable callable)
{
return NewProxyObject(cx, handler, priv_, TaggedProto(proto_), parent_, call_, construct_);
return NewProxyObject(cx, handler, priv_, TaggedProto(proto_), parent_, callable);
}
JS_FRIEND_API(JSObject *)
js::NewProxyObject(JSContext *cx, BaseProxyHandler *handler, const Value &priv_, JSObject *proto_,
JSObject *parent_, JSObject *call, JSObject *construct)
{
JS_ASSERT_IF(construct, cx->compartment == construct->compartment());
JS_ASSERT_IF(call && cx->compartment != call->compartment(), priv_ == ObjectValue(*call));
JSObject *proxy = NewProxyObject(cx, handler, priv_, TaggedProto(proto_), parent_,
call || construct ? ProxyIsCallable : ProxyNotCallable);
if (!proxy)
return NULL;
if (call)
proxy->initCrossCompartmentSlot(JSSLOT_PROXY_CALL, ObjectValue(*call));
if (construct)
proxy->initCrossCompartmentSlot(JSSLOT_PROXY_CONSTRUCT, ObjectValue(*construct));
return proxy;
}
JSObject *
@ -3397,7 +3408,8 @@ proxy_createFunction(JSContext *cx, unsigned argc, Value *vp)
}
JSObject *proxy = NewProxyObject(cx, &ScriptedIndirectProxyHandler::singleton,
ObjectValue(*handler), proto, parent, call, construct);
ObjectValue(*handler), proto, parent,
call, construct);
if (!proxy)
return false;

12
js/src/jsproxy.h
View File

@ -345,10 +345,18 @@ SetProxyExtra(RawObject obj, size_t n, const Value &extra)
SetReservedSlot(obj, JSSLOT_PROXY_EXTRA + n, extra);
}
enum ProxyCallable {
ProxyNotCallable = false,
ProxyIsCallable = true
};
JS_FRIEND_API(JSObject *)
NewProxyObject(JSContext *cx, BaseProxyHandler *handler, const Value &priv,
JSObject *proto, JSObject *parent,
JSObject *call = NULL, JSObject *construct = NULL);
JSObject *proto, JSObject *parent, ProxyCallable callable = ProxyNotCallable);
JS_FRIEND_API(JSObject *)
NewProxyObject(JSContext *cx, BaseProxyHandler *handler, const Value &priv,
JSObject *proto, JSObject *parent, JSObject *call, JSObject *construct);
JSObject *
RenewProxyObject(JSContext *cx, JSObject *obj, BaseProxyHandler *handler, Value priv);

2
js/src/jswrapper.cpp
View File

@ -817,7 +817,7 @@ JSObject *
js::NewDeadProxyObject(JSContext *cx, JSObject *parent)
{
return NewProxyObject(cx, &DeadObjectProxy::singleton, NullValue(),
NULL, parent, NULL, NULL);
NULL, parent, ProxyNotCallable);
}
bool

3
js/src/vm/ScopeObject.cpp
View File

@ -1476,8 +1476,7 @@ DebugScopeObject::create(JSContext *cx, ScopeObject &scope, HandleObject enclosi
{
JS_ASSERT(scope.compartment() == cx->compartment);
JSObject *obj = NewProxyObject(cx, &DebugScopeProxy::singleton, ObjectValue(scope),
NULL /* proto */, &scope.global(),
NULL /* call */, NULL /* construct */);
NULL /* proto */, &scope.global(), ProxyNotCallable);
if (!obj)
return NULL;