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 903802 - Give a singleton type to the global scope polluter proxy, r=jandem.

Browse Source
This commit is contained in:
Brian Hackett 2013-09-19 16:24:48 -06:00
parent e453e29e37
commit 02f941c29f
4 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dom/base/WindowNamedPropertiesHandler.cpp
View File

@ -164,10 +164,15 @@ WindowNamedPropertiesHandler::Install(JSContext* aCx,
return; return;
} }
// Note: since the scope polluter proxy lives on the window's prototype
// chain, it needs a singleton type to avoid polluting type information
// for properties on the window.
JS::Rooted<JSObject*> gsp(aCx); JS::Rooted<JSObject*> gsp(aCx);
gsp = js::NewProxyObject(aCx, WindowNamedPropertiesHandler::getInstance(), gsp = js::NewProxyObject(aCx, WindowNamedPropertiesHandler::getInstance(),
JS::NullHandleValue, protoProto, JS::NullHandleValue, protoProto,
js::GetGlobalForObjectCrossCompartment(aProto)); js::GetGlobalForObjectCrossCompartment(aProto),
js::ProxyNotCallable,
/* singleton = */ true);
if (!gsp) { if (!gsp) {
return; return;
} }

10
js/src/jsproxy.cpp
View File

@ -3190,7 +3190,7 @@ const Class* const js::FunctionProxyClassPtr = &FunctionProxyObject::class_;
/* static */ ProxyObject * /* static */ ProxyObject *
ProxyObject::New(JSContext *cx, BaseProxyHandler *handler, HandleValue priv, TaggedProto proto_, ProxyObject::New(JSContext *cx, BaseProxyHandler *handler, HandleValue priv, TaggedProto proto_,
JSObject *parent_, ProxyCallable callable) JSObject *parent_, ProxyCallable callable, bool singleton)
{ {
Rooted<TaggedProto> proto(cx, proto_); Rooted<TaggedProto> proto(cx, proto_);
RootedObject parent(cx, parent_); RootedObject parent(cx, parent_);
@ -3209,14 +3209,14 @@ ProxyObject::New(JSContext *cx, BaseProxyHandler *handler, HandleValue priv, Tag
* their properties and so that we don't need to walk the compartment if * their properties and so that we don't need to walk the compartment if
* their prototype changes later. * their prototype changes later.
*/ */
if (proto.isObject()) { if (proto.isObject() && !singleton) {
RootedObject protoObj(cx, proto.toObject()); RootedObject protoObj(cx, proto.toObject());
if (!JSObject::setNewTypeUnknown(cx, clasp, protoObj)) if (!JSObject::setNewTypeUnknown(cx, clasp, protoObj))
return NULL; return NULL;
} }
NewObjectKind newKind = NewObjectKind newKind =
clasp == &OuterWindowProxyObject::class_ ? SingletonObject : GenericObject; (clasp == &OuterWindowProxyObject::class_ || singleton) ? SingletonObject : GenericObject;
gc::AllocKind allocKind = gc::GetGCObjectKind(clasp); gc::AllocKind allocKind = gc::GetGCObjectKind(clasp);
if (handler->finalizeInBackground(priv)) if (handler->finalizeInBackground(priv))
allocKind = GetBackgroundAllocKind(allocKind); allocKind = GetBackgroundAllocKind(allocKind);
@ -3237,9 +3237,9 @@ ProxyObject::New(JSContext *cx, BaseProxyHandler *handler, HandleValue priv, Tag
JS_FRIEND_API(JSObject *) JS_FRIEND_API(JSObject *)
js::NewProxyObject(JSContext *cx, BaseProxyHandler *handler, HandleValue priv, JSObject *proto_, js::NewProxyObject(JSContext *cx, BaseProxyHandler *handler, HandleValue priv, JSObject *proto_,
JSObject *parent_, ProxyCallable callable) JSObject *parent_, ProxyCallable callable, bool singleton)
{ {
return ProxyObject::New(cx, handler, priv, TaggedProto(proto_), parent_, callable); return ProxyObject::New(cx, handler, priv, TaggedProto(proto_), parent_, callable, singleton);
} }
static ProxyObject * static ProxyObject *

3
js/src/jsproxy.h
View File

@ -376,7 +376,8 @@ enum ProxyCallable {
JS_FRIEND_API(JSObject *) JS_FRIEND_API(JSObject *)
NewProxyObject(JSContext *cx, BaseProxyHandler *handler, HandleValue priv, NewProxyObject(JSContext *cx, BaseProxyHandler *handler, HandleValue priv,
JSObject *proto, JSObject *parent, ProxyCallable callable = ProxyNotCallable); JSObject *proto, JSObject *parent,
ProxyCallable callable = ProxyNotCallable, bool singleton = false);
JSObject * JSObject *
RenewProxyObject(JSContext *cx, JSObject *obj, BaseProxyHandler *handler, Value priv); RenewProxyObject(JSContext *cx, JSObject *obj, BaseProxyHandler *handler, Value priv);

2
js/src/vm/ProxyObject.h
View File

@ -24,7 +24,7 @@ class ProxyObject : public JSObject
public: public:
static ProxyObject *New(JSContext *cx, BaseProxyHandler *handler, HandleValue priv, static ProxyObject *New(JSContext *cx, BaseProxyHandler *handler, HandleValue priv,
TaggedProto proto_, JSObject *parent_, ProxyCallable callable); TaggedProto proto_, JSObject *parent_, ProxyCallable callable, bool singleton = false);
const Value &private_() { const Value &private_() {
return GetReservedSlot(this, PRIVATE_SLOT); return GetReservedSlot(this, PRIVATE_SLOT);