Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-03-09 04:25:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 921448 - Get rid of weird demultiplexing NewProxyObject overload. r=ejpbruel

Browse Source 
Function proxies are going away with these patches. First, let's stop pretending
like they're equal citizens with regular proxies.
This commit is contained in:
Bobby Holley 2013-10-04 13:29:33 +02:00
parent 27836d4cb9
commit 83679bdc9b
1 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
js/src/jsproxy.cpp
View File

@ -3240,17 +3240,8 @@ JS_FRIEND_API(JSObject *)
js::NewProxyObject(JSContext *cx, BaseProxyHandler *handler, HandleValue priv, JSObject *proto_,
JSObject *parent_, ProxyCallable callable, bool singleton)
{
return ProxyObject::New(cx, handler, priv, TaggedProto(proto_), parent_, callable, singleton);
}
static ProxyObject *
NewProxyObject(JSContext *cx, BaseProxyHandler *handler, HandleValue priv, JSObject *proto,
JSObject *parent, JSObject *call, JSObject *construct)
{
if (!call && !construct)
return ProxyObject::New(cx, handler, priv, TaggedProto(proto), parent, ProxyNotCallable);
return FunctionProxyObject::New(cx, handler, priv, proto, parent, call, construct);
return ProxyObject::New(cx, handler, priv, TaggedProto(proto_), parent_,
callable, singleton);
}
/* static */ FunctionProxyObject *
@ -3315,10 +3306,12 @@ proxy(JSContext *cx, unsigned argc, jsval *vp)
RootedObject proto(cx);
if (!JSObject::getProto(cx, target, &proto))
return false;
RootedObject fun(cx, target->isCallable() ? target.get() : (JSObject *) NULL);
RootedValue priv(cx, ObjectValue(*target));
ProxyObject *proxy = NewProxyObject(cx, &ScriptedDirectProxyHandler::singleton,
priv, proto, cx->global(), fun, fun);
ProxyObject *proxy = target->isCallable()
? FunctionProxyObject::New(cx, &ScriptedDirectProxyHandler::singleton,
priv, proto, cx->global(), target, target)
: ProxyObject::New(cx, &ScriptedDirectProxyHandler::singleton,
priv, TaggedProto(proto), cx->global(), ProxyNotCallable);
if (!proxy)
return false;
proxy->setExtra(0, ObjectOrNullValue(handler));
@ -3386,8 +3379,9 @@ proxy_createFunction(JSContext *cx, unsigned argc, Value *vp)
}
RootedValue priv(cx, ObjectValue(*handler));
JSObject *proxy = NewProxyObject(cx, &ScriptedIndirectProxyHandler::singleton,
priv, proto, parent, call, construct);
JSObject *proxy =
FunctionProxyObject::New(cx, &ScriptedIndirectProxyHandler::singleton,
priv, proto, parent, call, construct);
if (!proxy)
return false;