corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backed out changeset 9e900e87b4bb (bug 1085566)

Browse Source
This commit is contained in:
Carsten "Tomcat" Book
2014-10-22 08:59:09 +02:00
parent 6b7490c4d7
commit 77dee816cc
34 changed files with 95 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
dom/base/WindowNamedPropertiesHandler.h
View File

@@ -20,11 +20,12 @@ public:
{ {
} }
virtual bool virtual bool
preventExtensions(JSContext* aCx, JS::Handle<JSObject*> aProxy, preventExtensions(JSContext* aCx, JS::Handle<JSObject*> aProxy) const MOZ_OVERRIDE
bool *succeeded) const MOZ_OVERRIDE
{ {
*succeeded = false; // Throw a TypeError, per WebIDL.
return true; JS_ReportErrorNumber(aCx, js_GetErrorMessage, nullptr,
JSMSG_CANT_CHANGE_EXTENSIBILITY);
return false;
} }
virtual bool virtual bool
getOwnPropDescriptor(JSContext* aCx, JS::Handle<JSObject*> aProxy, getOwnPropDescriptor(JSContext* aCx, JS::Handle<JSObject*> aProxy,

11
dom/base/nsGlobalWindow.cpp
View File

@@ -623,8 +623,7 @@ public:
virtual bool isExtensible(JSContext *cx, JS::Handle<JSObject*> proxy, bool *extensible) virtual bool isExtensible(JSContext *cx, JS::Handle<JSObject*> proxy, bool *extensible)
const MOZ_OVERRIDE; const MOZ_OVERRIDE;
virtual bool preventExtensions(JSContext *cx, virtual bool preventExtensions(JSContext *cx,
JS::Handle<JSObject*> proxy, JS::Handle<JSObject*> proxy) const MOZ_OVERRIDE;
bool *succeeded) const MOZ_OVERRIDE;
virtual bool has(JSContext *cx, JS::Handle<JSObject*> proxy, virtual bool has(JSContext *cx, JS::Handle<JSObject*> proxy,
JS::Handle<jsid> id, bool *bp) const MOZ_OVERRIDE; JS::Handle<jsid> id, bool *bp) const MOZ_OVERRIDE;
virtual bool get(JSContext *cx, JS::Handle<JSObject*> proxy, virtual bool get(JSContext *cx, JS::Handle<JSObject*> proxy,
@@ -720,12 +719,12 @@ nsOuterWindowProxy::isExtensible(JSContext *cx, JS::Handle<JSObject*> proxy,
bool bool
nsOuterWindowProxy::preventExtensions(JSContext *cx, nsOuterWindowProxy::preventExtensions(JSContext *cx,
JS::Handle<JSObject*> proxy, JS::Handle<JSObject*> proxy) const
bool *succeeded) const
{ {
// See above. // See above.
*succeeded = false; JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr,
return true; JSMSG_CANT_CHANGE_EXTENSIBILITY);
return false;
} }
const char * const char *

9
dom/bindings/DOMJSProxyHandler.cpp
View File

@@ -149,11 +149,12 @@ DOMProxyHandler::isExtensible(JSContext *cx, JS::Handle<JSObject*> proxy, bool *
} }
bool bool
DOMProxyHandler::preventExtensions(JSContext *cx, JS::Handle<JSObject*> proxy, DOMProxyHandler::preventExtensions(JSContext *cx, JS::Handle<JSObject*> proxy) const
bool *succeeded) const
{ {
*succeeded = false; // Throw a TypeError, per WebIDL.
return true; JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr,
JSMSG_CANT_CHANGE_EXTENSIBILITY);
return false;
} }
bool bool

3
dom/bindings/DOMJSProxyHandler.h
View File

@@ -117,8 +117,7 @@ public:
JS::Handle<jsid> id, bool* bp) const MOZ_OVERRIDE; JS::Handle<jsid> id, bool* bp) const MOZ_OVERRIDE;
bool isExtensible(JSContext *cx, JS::Handle<JSObject*> proxy, bool *extensible) bool isExtensible(JSContext *cx, JS::Handle<JSObject*> proxy, bool *extensible)
const MOZ_OVERRIDE; const MOZ_OVERRIDE;
bool preventExtensions(JSContext *cx, JS::Handle<JSObject*> proxy, bool preventExtensions(JSContext *cx, JS::Handle<JSObject*> proxy) const MOZ_OVERRIDE;
bool *succeeded) const MOZ_OVERRIDE;
bool has(JSContext* cx, JS::Handle<JSObject*> proxy, JS::Handle<jsid> id, bool has(JSContext* cx, JS::Handle<JSObject*> proxy, JS::Handle<jsid> id,
bool* bp) const MOZ_OVERRIDE; bool* bp) const MOZ_OVERRIDE;
bool set(JSContext *cx, JS::Handle<JSObject*> proxy, JS::Handle<JSObject*> receiver, bool set(JSContext *cx, JS::Handle<JSObject*> proxy, JS::Handle<JSObject*> receiver,

11
js/ipc/JavaScriptBase.h
View File

@@ -35,10 +35,8 @@ class JavaScriptBase : public WrapperOwner, public WrapperAnswer, public Base
/*** IPC handlers ***/ /*** IPC handlers ***/
bool RecvPreventExtensions(const uint64_t &objId, ReturnStatus *rs, bool RecvPreventExtensions(const uint64_t &objId, ReturnStatus *rs) {
bool *succeeded) { return Answer::RecvPreventExtensions(ObjectId::deserialize(objId), rs);
return Answer::RecvPreventExtensions(ObjectId::deserialize(objId), rs,
succeeded);
} }
bool RecvGetPropertyDescriptor(const uint64_t &objId, const JSIDVariant &id, bool RecvGetPropertyDescriptor(const uint64_t &objId, const JSIDVariant &id,
ReturnStatus *rs, ReturnStatus *rs,
@@ -133,9 +131,8 @@ class JavaScriptBase : public WrapperOwner, public WrapperAnswer, public Base
bool SendDropObject(const ObjectId &objId) { bool SendDropObject(const ObjectId &objId) {
return Base::SendDropObject(objId.serialize()); return Base::SendDropObject(objId.serialize());
} }
bool SendPreventExtensions(const ObjectId &objId, ReturnStatus *rs, bool SendPreventExtensions(const ObjectId &objId, ReturnStatus *rs) {
bool *succeeded) { return Base::SendPreventExtensions(objId.serialize(), rs);
return Base::SendPreventExtensions(objId.serialize(), rs, succeeded);
} }
bool SendGetPropertyDescriptor(const ObjectId &objId, const JSIDVariant &id, bool SendGetPropertyDescriptor(const ObjectId &objId, const JSIDVariant &id,
ReturnStatus *rs, ReturnStatus *rs,

2
js/ipc/PJavaScript.ipdl
View File

@@ -24,7 +24,7 @@ both:
async DropObject(uint64_t objId); async DropObject(uint64_t objId);
// These roughly map to the ProxyHandler hooks that CPOWs need. // These roughly map to the ProxyHandler hooks that CPOWs need.
prio(high) sync PreventExtensions(uint64_t objId) returns (ReturnStatus rs, bool result); prio(high) sync PreventExtensions(uint64_t objId) returns (ReturnStatus rs);
prio(high) sync GetPropertyDescriptor(uint64_t objId, JSIDVariant id) returns (ReturnStatus rs, PPropertyDescriptor result); prio(high) sync GetPropertyDescriptor(uint64_t objId, JSIDVariant id) returns (ReturnStatus rs, PPropertyDescriptor result);
prio(high) sync GetOwnPropertyDescriptor(uint64_t objId, JSIDVariant id) returns (ReturnStatus rs, PPropertyDescriptor result); prio(high) sync GetOwnPropertyDescriptor(uint64_t objId, JSIDVariant id) returns (ReturnStatus rs, PPropertyDescriptor result);
prio(high) sync DefineProperty(uint64_t objId, JSIDVariant id, PPropertyDescriptor descriptor) returns (ReturnStatus rs); prio(high) sync DefineProperty(uint64_t objId, JSIDVariant id, PPropertyDescriptor descriptor) returns (ReturnStatus rs);

5
js/ipc/WrapperAnswer.cpp
View File

@@ -58,8 +58,7 @@ WrapperAnswer::ok(ReturnStatus *rs)
} }
bool bool
WrapperAnswer::RecvPreventExtensions(const ObjectId &objId, ReturnStatus *rs, WrapperAnswer::RecvPreventExtensions(const ObjectId &objId, ReturnStatus *rs)
bool *succeeded)
{ {
AutoSafeJSContext cx; AutoSafeJSContext cx;
JSAutoRequest request(cx); JSAutoRequest request(cx);
@@ -69,7 +68,7 @@ WrapperAnswer::RecvPreventExtensions(const ObjectId &objId, ReturnStatus *rs,
return fail(cx, rs); return fail(cx, rs);
JSAutoCompartment comp(cx, obj); JSAutoCompartment comp(cx, obj);
if (!JS_PreventExtensions(cx, obj, succeeded)) if (!JS_PreventExtensions(cx, obj))
return fail(cx, rs); return fail(cx, rs);
LOG("%s.preventExtensions()", ReceiverObj(objId)); LOG("%s.preventExtensions()", ReceiverObj(objId));

3
js/ipc/WrapperAnswer.h
View File

@@ -18,8 +18,7 @@ class WrapperAnswer : public virtual JavaScriptShared
public: public:
explicit WrapperAnswer(JSRuntime *rt) : JavaScriptShared(rt) {} explicit WrapperAnswer(JSRuntime *rt) : JavaScriptShared(rt) {}
bool RecvPreventExtensions(const ObjectId &objId, ReturnStatus *rs, bool RecvPreventExtensions(const ObjectId &objId, ReturnStatus *rs);
bool *succeeded);
bool RecvGetPropertyDescriptor(const ObjectId &objId, const JSIDVariant &id, bool RecvGetPropertyDescriptor(const ObjectId &objId, const JSIDVariant &id,
ReturnStatus *rs, ReturnStatus *rs,
PPropertyDescriptor *out); PPropertyDescriptor *out);

10
js/ipc/WrapperOwner.cpp
View File

@@ -72,7 +72,7 @@ class CPOWProxyHandler : public BaseProxyHandler
virtual bool delete_(JSContext *cx, HandleObject proxy, HandleId id, bool *bp) const MOZ_OVERRIDE; virtual bool delete_(JSContext *cx, HandleObject proxy, HandleId id, bool *bp) const MOZ_OVERRIDE;
virtual bool enumerate(JSContext *cx, HandleObject proxy, AutoIdVector &props) const MOZ_OVERRIDE; virtual bool enumerate(JSContext *cx, HandleObject proxy, AutoIdVector &props) const MOZ_OVERRIDE;
virtual bool isExtensible(JSContext *cx, HandleObject proxy, bool *extensible) const MOZ_OVERRIDE; virtual bool isExtensible(JSContext *cx, HandleObject proxy, bool *extensible) const MOZ_OVERRIDE;
virtual bool preventExtensions(JSContext *cx, HandleObject proxy, bool *succeeded) const MOZ_OVERRIDE; virtual bool preventExtensions(JSContext *cx, HandleObject proxy) const MOZ_OVERRIDE;
virtual bool has(JSContext *cx, HandleObject proxy, HandleId id, bool *bp) const MOZ_OVERRIDE; virtual bool has(JSContext *cx, HandleObject proxy, HandleId id, bool *bp) const MOZ_OVERRIDE;
virtual bool get(JSContext *cx, HandleObject proxy, HandleObject receiver, virtual bool get(JSContext *cx, HandleObject proxy, HandleObject receiver,
HandleId id, MutableHandleValue vp) const MOZ_OVERRIDE; HandleId id, MutableHandleValue vp) const MOZ_OVERRIDE;
@@ -113,18 +113,18 @@ const CPOWProxyHandler CPOWProxyHandler::singleton;
return owner->call args; return owner->call args;
bool bool
CPOWProxyHandler::preventExtensions(JSContext *cx, HandleObject proxy, bool *succeeded) const CPOWProxyHandler::preventExtensions(JSContext *cx, HandleObject proxy) const
{ {
FORWARD(preventExtensions, (cx, proxy, succeeded)); FORWARD(preventExtensions, (cx, proxy));
} }
bool bool
WrapperOwner::preventExtensions(JSContext *cx, HandleObject proxy, bool *succeeded) WrapperOwner::preventExtensions(JSContext *cx, HandleObject proxy)
{ {
ObjectId objId = idOf(proxy); ObjectId objId = idOf(proxy);
ReturnStatus status; ReturnStatus status;
if (!SendPreventExtensions(objId, &status, succeeded)) if (!SendPreventExtensions(objId, &status))
return ipcfail(cx); return ipcfail(cx);
LOG_STACK(); LOG_STACK();

5
js/ipc/WrapperOwner.h
View File

@@ -41,7 +41,7 @@ class WrapperOwner : public virtual JavaScriptShared
bool delete_(JSContext *cx, JS::HandleObject proxy, JS::HandleId id, bool *bp); bool delete_(JSContext *cx, JS::HandleObject proxy, JS::HandleId id, bool *bp);
bool enumerate(JSContext *cx, JS::HandleObject proxy, JS::AutoIdVector &props); bool enumerate(JSContext *cx, JS::HandleObject proxy, JS::AutoIdVector &props);
bool isExtensible(JSContext *cx, JS::HandleObject proxy, bool *extensible); bool isExtensible(JSContext *cx, JS::HandleObject proxy, bool *extensible);
bool preventExtensions(JSContext *cx, JS::HandleObject proxy, bool *succeeded); bool preventExtensions(JSContext *cx, JS::HandleObject proxy);
bool has(JSContext *cx, JS::HandleObject proxy, JS::HandleId id, bool *bp); bool has(JSContext *cx, JS::HandleObject proxy, JS::HandleId id, bool *bp);
bool get(JSContext *cx, JS::HandleObject proxy, JS::HandleObject receiver, bool get(JSContext *cx, JS::HandleObject proxy, JS::HandleObject receiver,
JS::HandleId id, JS::MutableHandleValue vp); JS::HandleId id, JS::MutableHandleValue vp);
@@ -106,8 +106,7 @@ class WrapperOwner : public virtual JavaScriptShared
/*** Dummy call handlers ***/ /*** Dummy call handlers ***/
public: public:
virtual bool SendDropObject(const ObjectId &objId) = 0; virtual bool SendDropObject(const ObjectId &objId) = 0;
virtual bool SendPreventExtensions(const ObjectId &objId, ReturnStatus *rs, virtual bool SendPreventExtensions(const ObjectId &objId, ReturnStatus *rs) = 0;
bool *succeeded) = 0;
virtual bool SendGetPropertyDescriptor(const ObjectId &objId, const JSIDVariant &id, virtual bool SendGetPropertyDescriptor(const ObjectId &objId, const JSIDVariant &id,
ReturnStatus *rs, ReturnStatus *rs,
PPropertyDescriptor *out) = 0; PPropertyDescriptor *out) = 0;

17
js/src/builtin/Object.cpp
View File

@@ -1012,7 +1012,7 @@ obj_isExtensible(JSContext *cx, unsigned argc, Value *vp)
return true; return true;
} }
// ES6 20141014 draft 19.1.2.15 Object.preventExtensions(O) // ES6 draft rev27 (2014/08/24) 19.1.2.15 Object.preventExtensions(O)
static bool static bool
obj_preventExtensions(JSContext *cx, unsigned argc, Value *vp) obj_preventExtensions(JSContext *cx, unsigned argc, Value *vp)
{ {
@@ -1023,21 +1023,10 @@ obj_preventExtensions(JSContext *cx, unsigned argc, Value *vp)
if (!args.get(0).isObject()) if (!args.get(0).isObject())
return true; return true;
// Steps 2-3. // Steps 2-5.
RootedObject obj(cx, &args.get(0).toObject()); RootedObject obj(cx, &args.get(0).toObject());
bool status; return JSObject::preventExtensions(cx, obj);
if (!JSObject::preventExtensions(cx, obj, &status))
return false;
// Step 4.
if (!status) {
JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_CANT_CHANGE_EXTENSIBILITY);
return false;
}
// Step 5.
return true;
} }
// ES6 draft rev27 (2014/08/24) 19.1.2.5 Object.freeze(O) // ES6 draft rev27 (2014/08/24) 19.1.2.5 Object.freeze(O)

4
js/src/jsapi.cpp
View File

@@ -6458,9 +6458,9 @@ JS_DecodeInterpretedFunction(JSContext *cx, const void *data, uint32_t length)
} }
JS_PUBLIC_API(bool) JS_PUBLIC_API(bool)
JS_PreventExtensions(JSContext *cx, JS::HandleObject obj, bool *succeeded) JS_PreventExtensions(JSContext *cx, JS::HandleObject obj)
{ {
return JSObject::preventExtensions(cx, obj, succeeded); return JSObject::preventExtensions(cx, obj);
} }
JS_PUBLIC_API(void) JS_PUBLIC_API(void)

2
js/src/jsapi.h
View File

@@ -2795,7 +2795,7 @@ extern JS_PUBLIC_API(bool)
JS_FreezeObject(JSContext *cx, JS::Handle<JSObject*> obj); JS_FreezeObject(JSContext *cx, JS::Handle<JSObject*> obj);
extern JS_PUBLIC_API(bool) extern JS_PUBLIC_API(bool)
JS_PreventExtensions(JSContext *cx, JS::HandleObject obj, bool *succeeded); JS_PreventExtensions(JSContext *cx, JS::HandleObject obj);
extern JS_PUBLIC_API(JSObject *) extern JS_PUBLIC_API(JSObject *)
JS_New(JSContext *cx, JS::HandleObject ctor, const JS::HandleValueArray& args); JS_New(JSContext *cx, JS::HandleObject ctor, const JS::HandleValueArray& args);

9
js/src/jsfun.cpp
View File

@@ -868,17 +868,10 @@ CreateFunctionPrototype(JSContext *cx, JSProtoKey key)
SingletonObject)); SingletonObject));
if (!tte) if (!tte)
return nullptr; return nullptr;
bool succeeded;
RootedFunction throwTypeError(cx, NewFunction(cx, tte, ThrowTypeError, 0, RootedFunction throwTypeError(cx, NewFunction(cx, tte, ThrowTypeError, 0,
JSFunction::NATIVE_FUN, self, js::NullPtr())); JSFunction::NATIVE_FUN, self, js::NullPtr()));
if (!throwTypeError || !JSObject::preventExtensions(cx, throwTypeError, &succeeded)) if (!throwTypeError || !JSObject::preventExtensions(cx, throwTypeError))
return nullptr; return nullptr;
if (!succeeded) {
JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_CANT_CHANGE_EXTENSIBILITY);
return nullptr;
}
self->setThrowTypeError(throwTypeError); self->setThrowTypeError(throwTypeError);
return functionProto; return functionProto;

7
js/src/jsobj.cpp
View File

@@ -1229,13 +1229,8 @@ JSObject::sealOrFreeze(JSContext *cx, HandleObject obj, ImmutabilityType it)
assertSameCompartment(cx, obj); assertSameCompartment(cx, obj);
MOZ_ASSERT(it == SEAL || it == FREEZE); MOZ_ASSERT(it == SEAL || it == FREEZE);
bool succeeded; if (!JSObject::preventExtensions(cx, obj))
if (!JSObject::preventExtensions(cx, obj, &succeeded))
return false; return false;
if (!succeeded) {
JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_CANT_CHANGE_EXTENSIBILITY);
return false;
}
AutoIdVector props(cx); AutoIdVector props(cx);
if (!GetPropertyKeys(cx, obj, JSITER_HIDDEN | JSITER_OWNONLY | JSITER_SYMBOLS, &props)) if (!GetPropertyKeys(cx, obj, JSITER_HIDDEN | JSITER_OWNONLY | JSITER_SYMBOLS, &props))

7
js/src/jsobj.h
View File

@@ -514,11 +514,10 @@ class JSObject : public js::gc::Cell
return !lastProperty()->hasObjectFlag(js::BaseShape::NOT_EXTENSIBLE); return !lastProperty()->hasObjectFlag(js::BaseShape::NOT_EXTENSIBLE);
} }
// Attempt to change the [[Extensible]] bit on |obj| to false. Indicate // Attempt to change the [[Extensible]] bit on |obj| to false. Callers
// success or failure through the |*succeeded| outparam, or actual error // must ensure that |obj| is currently extensible before calling this!
// through the return value.
static bool static bool
preventExtensions(JSContext *cx, js::HandleObject obj, bool *succeeded); preventExtensions(JSContext *cx, js::HandleObject obj);
private: private:
enum ImmutabilityType { SEAL, FREEZE }; enum ImmutabilityType { SEAL, FREEZE };

4
js/src/jsproxy.h
View File

@@ -257,7 +257,7 @@ class JS_FRIEND_API(BaseProxyHandler)
virtual bool delete_(JSContext *cx, HandleObject proxy, HandleId id, bool *bp) const = 0; virtual bool delete_(JSContext *cx, HandleObject proxy, HandleId id, bool *bp) const = 0;
virtual bool enumerate(JSContext *cx, HandleObject proxy, AutoIdVector &props) const = 0; virtual bool enumerate(JSContext *cx, HandleObject proxy, AutoIdVector &props) const = 0;
virtual bool isExtensible(JSContext *cx, HandleObject proxy, bool *extensible) const = 0; virtual bool isExtensible(JSContext *cx, HandleObject proxy, bool *extensible) const = 0;
virtual bool preventExtensions(JSContext *cx, HandleObject proxy, bool *succeeded) const = 0; virtual bool preventExtensions(JSContext *cx, HandleObject proxy) const = 0;
/* /*
* These methods are standard, but the engine does not normally call them. * These methods are standard, but the engine does not normally call them.
@@ -369,7 +369,7 @@ class JS_PUBLIC_API(DirectProxyHandler) : public BaseProxyHandler
virtual bool enumerate(JSContext *cx, HandleObject proxy, virtual bool enumerate(JSContext *cx, HandleObject proxy,
AutoIdVector &props) const MOZ_OVERRIDE; AutoIdVector &props) const MOZ_OVERRIDE;
virtual bool isExtensible(JSContext *cx, HandleObject proxy, bool *extensible) const MOZ_OVERRIDE; virtual bool isExtensible(JSContext *cx, HandleObject proxy, bool *extensible) const MOZ_OVERRIDE;
virtual bool preventExtensions(JSContext *cx, HandleObject proxy, bool *succeeded) const MOZ_OVERRIDE; virtual bool preventExtensions(JSContext *cx, HandleObject proxy) const MOZ_OVERRIDE;
virtual bool getPrototypeOf(JSContext *cx, HandleObject proxy, virtual bool getPrototypeOf(JSContext *cx, HandleObject proxy,
MutableHandleObject protop) const MOZ_OVERRIDE; MutableHandleObject protop) const MOZ_OVERRIDE;
virtual bool setPrototypeOf(JSContext *cx, HandleObject proxy, HandleObject proto, virtual bool setPrototypeOf(JSContext *cx, HandleObject proxy, HandleObject proto,

4
js/src/jswrapper.h
View File

@@ -123,7 +123,7 @@ class JS_FRIEND_API(CrossCompartmentWrapper) : public Wrapper
virtual bool delete_(JSContext *cx, HandleObject wrapper, HandleId id, bool *bp) const MOZ_OVERRIDE; virtual bool delete_(JSContext *cx, HandleObject wrapper, HandleId id, bool *bp) const MOZ_OVERRIDE;
virtual bool enumerate(JSContext *cx, HandleObject wrapper, AutoIdVector &props) const MOZ_OVERRIDE; virtual bool enumerate(JSContext *cx, HandleObject wrapper, AutoIdVector &props) const MOZ_OVERRIDE;
virtual bool isExtensible(JSContext *cx, HandleObject wrapper, bool *extensible) const MOZ_OVERRIDE; virtual bool isExtensible(JSContext *cx, HandleObject wrapper, bool *extensible) const MOZ_OVERRIDE;
virtual bool preventExtensions(JSContext *cx, HandleObject wrapper, bool *succeeded) const MOZ_OVERRIDE; virtual bool preventExtensions(JSContext *cx, HandleObject wrapper) const MOZ_OVERRIDE;
virtual bool getPrototypeOf(JSContext *cx, HandleObject proxy, virtual bool getPrototypeOf(JSContext *cx, HandleObject proxy,
MutableHandleObject protop) const MOZ_OVERRIDE; MutableHandleObject protop) const MOZ_OVERRIDE;
virtual bool setPrototypeOf(JSContext *cx, HandleObject proxy, HandleObject proto, virtual bool setPrototypeOf(JSContext *cx, HandleObject proxy, HandleObject proto,
@@ -185,7 +185,7 @@ class JS_FRIEND_API(SecurityWrapper) : public Base
virtual bool defineProperty(JSContext *cx, HandleObject wrapper, HandleId id, virtual bool defineProperty(JSContext *cx, HandleObject wrapper, HandleId id,
MutableHandle<JSPropertyDescriptor> desc) const MOZ_OVERRIDE; MutableHandle<JSPropertyDescriptor> desc) const MOZ_OVERRIDE;
virtual bool isExtensible(JSContext *cx, HandleObject wrapper, bool *extensible) const MOZ_OVERRIDE; virtual bool isExtensible(JSContext *cx, HandleObject wrapper, bool *extensible) const MOZ_OVERRIDE;
virtual bool preventExtensions(JSContext *cx, HandleObject wrapper, bool *succeeded) const MOZ_OVERRIDE; virtual bool preventExtensions(JSContext *cx, HandleObject wrapper) const MOZ_OVERRIDE;
virtual bool setPrototypeOf(JSContext *cx, HandleObject proxy, HandleObject proto, virtual bool setPrototypeOf(JSContext *cx, HandleObject proxy, HandleObject proto,
bool *bp) const MOZ_OVERRIDE; bool *bp) const MOZ_OVERRIDE;
virtual bool setImmutablePrototype(JSContext *cx, HandleObject proxy, bool *succeeded) const MOZ_OVERRIDE; virtual bool setImmutablePrototype(JSContext *cx, HandleObject proxy, bool *succeeded) const MOZ_OVERRIDE;

5
js/src/proxy/CrossCompartmentWrapper.cpp
View File

@@ -37,12 +37,11 @@ CrossCompartmentWrapper::isExtensible(JSContext *cx, HandleObject wrapper, bool
} }
bool bool
CrossCompartmentWrapper::preventExtensions(JSContext *cx, HandleObject wrapper, CrossCompartmentWrapper::preventExtensions(JSContext *cx, HandleObject wrapper) const
bool *succeeded) const
{ {
PIERCE(cx, wrapper, PIERCE(cx, wrapper,
NOTHING, NOTHING,
Wrapper::preventExtensions(cx, wrapper, succeeded), Wrapper::preventExtensions(cx, wrapper),
NOTHING); NOTHING);
} }

2
js/src/proxy/DeadObjectProxy.cpp
View File

@@ -24,7 +24,7 @@ DeadObjectProxy::isExtensible(JSContext *cx, HandleObject proxy, bool *extensibl
} }
bool bool
DeadObjectProxy::preventExtensions(JSContext *cx, HandleObject proxy, bool *succeeded) const DeadObjectProxy::preventExtensions(JSContext *cx, HandleObject proxy) const
{ {
JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_DEAD_OBJECT); JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_DEAD_OBJECT);
return false; return false;

2
js/src/proxy/DeadObjectProxy.h
View File

@@ -28,7 +28,7 @@ class DeadObjectProxy : public BaseProxyHandler
virtual bool delete_(JSContext *cx, HandleObject wrapper, HandleId id, bool *bp) const MOZ_OVERRIDE; virtual bool delete_(JSContext *cx, HandleObject wrapper, HandleId id, bool *bp) const MOZ_OVERRIDE;
virtual bool enumerate(JSContext *cx, HandleObject wrapper, AutoIdVector &props) const MOZ_OVERRIDE; virtual bool enumerate(JSContext *cx, HandleObject wrapper, AutoIdVector &props) const MOZ_OVERRIDE;
virtual bool isExtensible(JSContext *cx, HandleObject proxy, bool *extensible) const MOZ_OVERRIDE; virtual bool isExtensible(JSContext *cx, HandleObject proxy, bool *extensible) const MOZ_OVERRIDE;
virtual bool preventExtensions(JSContext *cx, HandleObject proxy, bool *succeeded) const MOZ_OVERRIDE; virtual bool preventExtensions(JSContext *cx, HandleObject proxy) const MOZ_OVERRIDE;
virtual bool getPrototypeOf(JSContext *cx, HandleObject proxy, virtual bool getPrototypeOf(JSContext *cx, HandleObject proxy,
MutableHandleObject protop) const MOZ_OVERRIDE; MutableHandleObject protop) const MOZ_OVERRIDE;
virtual bool call(JSContext *cx, HandleObject proxy, const CallArgs &args) const MOZ_OVERRIDE; virtual bool call(JSContext *cx, HandleObject proxy, const CallArgs &args) const MOZ_OVERRIDE;

4
js/src/proxy/DirectProxyHandler.cpp
View File

@@ -251,10 +251,10 @@ DirectProxyHandler::isExtensible(JSContext *cx, HandleObject proxy, bool *extens
} }
bool bool
DirectProxyHandler::preventExtensions(JSContext *cx, HandleObject proxy, bool *succeeded) const DirectProxyHandler::preventExtensions(JSContext *cx, HandleObject proxy) const
{ {
RootedObject target(cx, proxy->as<ProxyObject>().target()); RootedObject target(cx, proxy->as<ProxyObject>().target());
return JSObject::preventExtensions(cx, target, succeeded); return JSObject::preventExtensions(cx, target);
} }
bool bool

4
js/src/proxy/Proxy.cpp
View File

@@ -387,11 +387,11 @@ Proxy::isExtensible(JSContext *cx, HandleObject proxy, bool *extensible)
} }
bool bool
Proxy::preventExtensions(JSContext *cx, HandleObject proxy, bool *succeeded) Proxy::preventExtensions(JSContext *cx, HandleObject proxy)
{ {
JS_CHECK_RECURSION(cx, return false); JS_CHECK_RECURSION(cx, return false);
const BaseProxyHandler *handler = proxy->as<ProxyObject>().handler(); const BaseProxyHandler *handler = proxy->as<ProxyObject>().handler();
return handler->preventExtensions(cx, proxy, succeeded); return handler->preventExtensions(cx, proxy);
} }
bool bool

2
js/src/proxy/Proxy.h
View File

@@ -36,7 +36,7 @@ class Proxy
static bool delete_(JSContext *cx, HandleObject proxy, HandleId id, bool *bp); static bool delete_(JSContext *cx, HandleObject proxy, HandleId id, bool *bp);
static bool enumerate(JSContext *cx, HandleObject proxy, AutoIdVector &props); static bool enumerate(JSContext *cx, HandleObject proxy, AutoIdVector &props);
static bool isExtensible(JSContext *cx, HandleObject proxy, bool *extensible); static bool isExtensible(JSContext *cx, HandleObject proxy, bool *extensible);
static bool preventExtensions(JSContext *cx, HandleObject proxy, bool *succeeded); static bool preventExtensions(JSContext *cx, HandleObject proxy);
static bool getPrototypeOf(JSContext *cx, HandleObject proxy, MutableHandleObject protop); static bool getPrototypeOf(JSContext *cx, HandleObject proxy, MutableHandleObject protop);
static bool setPrototypeOf(JSContext *cx, HandleObject proxy, HandleObject proto, bool *bp); static bool setPrototypeOf(JSContext *cx, HandleObject proxy, HandleObject proto, bool *bp);
static bool setImmutablePrototype(JSContext *cx, HandleObject proxy, bool *succeeded); static bool setImmutablePrototype(JSContext *cx, HandleObject proxy, bool *succeeded);

38
js/src/proxy/ScriptedDirectProxyHandler.cpp
View File

@@ -273,31 +273,32 @@ ArrayToIdVector(JSContext *cx, HandleObject proxy, HandleObject target, HandleVa
return true; return true;
} }
// ES6 20141014 9.5.4 Proxy.[[PreventExtensions]]() // ES6 (22 May, 2014) 9.5.4 Proxy.[[PreventExtensions]]()
bool bool
ScriptedDirectProxyHandler::preventExtensions(JSContext *cx, HandleObject proxy, ScriptedDirectProxyHandler::preventExtensions(JSContext *cx, HandleObject proxy) const
bool *succeeded) const
{ {
// Steps 1-3. // step 1
RootedObject handler(cx, GetDirectProxyHandlerObject(proxy)); RootedObject handler(cx, GetDirectProxyHandlerObject(proxy));
// step 2
if (!handler) { if (!handler) {
JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_PROXY_REVOKED); JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_PROXY_REVOKED);
return false; return false;
} }
// Step 4. // step 3
RootedObject target(cx, proxy->as<ProxyObject>().target()); RootedObject target(cx, proxy->as<ProxyObject>().target());
// Steps 5-6. // step 4-5
RootedValue trap(cx); RootedValue trap(cx);
if (!JSObject::getProperty(cx, handler, handler, cx->names().preventExtensions, &trap)) if (!JSObject::getProperty(cx, handler, handler, cx->names().preventExtensions, &trap))
return false; return false;
// Step 7. // step 6
if (trap.isUndefined()) if (trap.isUndefined())
return DirectProxyHandler::preventExtensions(cx, proxy, succeeded); return DirectProxyHandler::preventExtensions(cx, proxy);
// Steps 8, 10. // step 7, 9
Value argv[] = { Value argv[] = {
ObjectValue(*target) ObjectValue(*target)
}; };
@@ -305,11 +306,10 @@ ScriptedDirectProxyHandler::preventExtensions(JSContext *cx, HandleObject proxy,
if (!Invoke(cx, ObjectValue(*handler), trap, ArrayLength(argv), argv, &trapResult)) if (!Invoke(cx, ObjectValue(*handler), trap, ArrayLength(argv), argv, &trapResult))
return false; return false;
// Step 9. // step 8
bool booleanTrapResult = ToBoolean(trapResult); bool success = ToBoolean(trapResult);
if (success) {
// Step 11. // step 10
if (booleanTrapResult) {
bool extensible; bool extensible;
if (!JSObject::isExtensible(cx, target, &extensible)) if (!JSObject::isExtensible(cx, target, &extensible))
return false; return false;
@@ -317,11 +317,15 @@ ScriptedDirectProxyHandler::preventExtensions(JSContext *cx, HandleObject proxy,
JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_CANT_REPORT_AS_NON_EXTENSIBLE); JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_CANT_REPORT_AS_NON_EXTENSIBLE);
return false; return false;
} }
// step 11 "return true"
return true;
} }
// Step 12. // step 11 "return false"
*succeeded = booleanTrapResult; // This actually corresponds to 19.1.2.5 step 4. We cannot pass the failure back, so throw here
return true; // directly instead.
JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_CANT_CHANGE_EXTENSIBILITY);
return false;
} }
// ES6 implements both getPrototypeOf and setPrototypeOf traps. We don't have them yet (see bug // ES6 implements both getPrototypeOf and setPrototypeOf traps. We don't have them yet (see bug

2
js/src/proxy/ScriptedDirectProxyHandler.h
View File

@@ -28,7 +28,7 @@ class ScriptedDirectProxyHandler : public DirectProxyHandler {
virtual bool delete_(JSContext *cx, HandleObject proxy, HandleId id, bool *bp) const MOZ_OVERRIDE; virtual bool delete_(JSContext *cx, HandleObject proxy, HandleId id, bool *bp) const MOZ_OVERRIDE;
virtual bool enumerate(JSContext *cx, HandleObject proxy, AutoIdVector &props) const MOZ_OVERRIDE; virtual bool enumerate(JSContext *cx, HandleObject proxy, AutoIdVector &props) const MOZ_OVERRIDE;
virtual bool isExtensible(JSContext *cx, HandleObject proxy, bool *extensible) const MOZ_OVERRIDE; virtual bool isExtensible(JSContext *cx, HandleObject proxy, bool *extensible) const MOZ_OVERRIDE;
virtual bool preventExtensions(JSContext *cx, HandleObject proxy, bool *succeeded) const MOZ_OVERRIDE; virtual bool preventExtensions(JSContext *cx, HandleObject proxy) const MOZ_OVERRIDE;
/* These two are standard internal methods but aren't implemented to spec yet. */ /* These two are standard internal methods but aren't implemented to spec yet. */
virtual bool getPrototypeOf(JSContext *cx, HandleObject proxy, virtual bool getPrototypeOf(JSContext *cx, HandleObject proxy,

6
js/src/proxy/ScriptedIndirectProxyHandler.cpp
View File

@@ -140,11 +140,11 @@ ScriptedIndirectProxyHandler::isExtensible(JSContext *cx, HandleObject proxy,
} }
bool bool
ScriptedIndirectProxyHandler::preventExtensions(JSContext *cx, HandleObject proxy, bool *succeeded) const ScriptedIndirectProxyHandler::preventExtensions(JSContext *cx, HandleObject proxy) const
{ {
// See above. // See above.
*succeeded = false; JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_CANT_CHANGE_EXTENSIBILITY);
return true; return false;
} }
static bool static bool

2
js/src/proxy/ScriptedIndirectProxyHandler.h
View File

@@ -29,7 +29,7 @@ class ScriptedIndirectProxyHandler : public BaseProxyHandler
virtual bool delete_(JSContext *cx, HandleObject proxy, HandleId id, bool *bp) const MOZ_OVERRIDE; virtual bool delete_(JSContext *cx, HandleObject proxy, HandleId id, bool *bp) const MOZ_OVERRIDE;
virtual bool enumerate(JSContext *cx, HandleObject proxy, AutoIdVector &props) const MOZ_OVERRIDE; virtual bool enumerate(JSContext *cx, HandleObject proxy, AutoIdVector &props) const MOZ_OVERRIDE;
virtual bool isExtensible(JSContext *cx, HandleObject proxy, bool *extensible) const MOZ_OVERRIDE; virtual bool isExtensible(JSContext *cx, HandleObject proxy, bool *extensible) const MOZ_OVERRIDE;
virtual bool preventExtensions(JSContext *cx, HandleObject proxy, bool *succeeded) const MOZ_OVERRIDE; virtual bool preventExtensions(JSContext *cx, HandleObject proxy) const MOZ_OVERRIDE;
virtual bool has(JSContext *cx, HandleObject proxy, HandleId id, bool *bp) const MOZ_OVERRIDE; virtual bool has(JSContext *cx, HandleObject proxy, HandleId id, bool *bp) const MOZ_OVERRIDE;
virtual bool get(JSContext *cx, HandleObject proxy, HandleObject receiver, HandleId id, virtual bool get(JSContext *cx, HandleObject proxy, HandleObject receiver, HandleId id,
MutableHandleValue vp) const MOZ_OVERRIDE; MutableHandleValue vp) const MOZ_OVERRIDE;

7
js/src/proxy/SecurityWrapper.cpp
View File

@@ -24,12 +24,11 @@ SecurityWrapper<Base>::isExtensible(JSContext *cx, HandleObject wrapper, bool *e
template <class Base> template <class Base>
bool bool
SecurityWrapper<Base>::preventExtensions(JSContext *cx, HandleObject wrapper, SecurityWrapper<Base>::preventExtensions(JSContext *cx, HandleObject wrapper) const
bool *succeeded) const
{ {
// See above. // See above.
*succeeded = false; JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_UNWRAP_DENIED);
return true; return false;
} }
template <class Base> template <class Base>

9
js/src/vm/Debugger.cpp
View File

@@ -5863,14 +5863,7 @@ DebuggerObject_sealHelper(JSContext *cx, unsigned argc, Value *vp, SealHelperOp
ok = JSObject::freeze(cx, obj); ok = JSObject::freeze(cx, obj);
} else { } else {
MOZ_ASSERT(op == PreventExtensions); MOZ_ASSERT(op == PreventExtensions);
bool succeeded; ok = JSObject::preventExtensions(cx, obj);
ok = JSObject::preventExtensions(cx, obj, &succeeded);
if (!ok)
return false;
if (!succeeded) {
JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_CANT_CHANGE_EXTENSIBILITY);
return false;
}
} }
if (!ok) if (!ok)
return false; return false;

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

@@ -1513,11 +1513,11 @@ class DebugScopeProxy : public BaseProxyHandler
return true; return true;
} }
bool preventExtensions(JSContext *cx, HandleObject proxy, bool *succeeded) const MOZ_OVERRIDE bool preventExtensions(JSContext *cx, HandleObject proxy) const MOZ_OVERRIDE
{ {
// See above. // See above.
*succeeded = false; JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_CANT_CHANGE_EXTENSIBILITY);
return true; return false;
} }
bool getPropertyDescriptor(JSContext *cx, HandleObject proxy, HandleId id, bool getPropertyDescriptor(JSContext *cx, HandleObject proxy, HandleId id,

9
js/src/vm/Shape.cpp
View File

@@ -1345,15 +1345,13 @@ Shape::setObjectMetadata(JSContext *cx, JSObject *metadata, TaggedProto proto, S
} }
/* static */ bool /* static */ bool
JSObject::preventExtensions(JSContext *cx, HandleObject obj, bool *succeeded) JSObject::preventExtensions(JSContext *cx, HandleObject obj)
{ {
if (obj->is<ProxyObject>()) if (obj->is<ProxyObject>())
return js::Proxy::preventExtensions(cx, obj, succeeded); return js::Proxy::preventExtensions(cx, obj);
if (!obj->nonProxyIsExtensible()) { if (!obj->nonProxyIsExtensible())
*succeeded = true;
return true; return true;
}
/* /*
* Force lazy properties to be resolved by iterating over the objects' own * Force lazy properties to be resolved by iterating over the objects' own
@@ -1372,7 +1370,6 @@ JSObject::preventExtensions(JSContext *cx, HandleObject obj, bool *succeeded)
if (obj->isNative() && !NativeObject::sparsifyDenseElements(cx, obj.as<NativeObject>())) if (obj->isNative() && !NativeObject::sparsifyDenseElements(cx, obj.as<NativeObject>()))
return false; return false;
*succeeded = true;
return obj->setFlag(cx, BaseShape::NOT_EXTENSIBLE, GENERATE_SHAPE); return obj->setFlag(cx, BaseShape::NOT_EXTENSIBLE, GENERATE_SHAPE);
} }

7
js/xpconnect/wrappers/XrayWrapper.cpp
View File

@@ -1759,12 +1759,11 @@ XrayWrapper<Base, Traits>::isExtensible(JSContext *cx, JS::Handle<JSObject*> wra
template <typename Base, typename Traits> template <typename Base, typename Traits>
bool bool
XrayWrapper<Base, Traits>::preventExtensions(JSContext *cx, HandleObject wrapper, bool *succeeded) XrayWrapper<Base, Traits>::preventExtensions(JSContext *cx, HandleObject wrapper) const
const
{ {
// See above. // See above.
*succeeded = false; JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_CANT_CHANGE_EXTENSIBILITY);
return true; return false;
} }
template <typename Base, typename Traits> template <typename Base, typename Traits>

2
js/xpconnect/wrappers/XrayWrapper.h
View File

@@ -415,7 +415,7 @@ class XrayWrapper : public Base {
JS::Handle<jsid> id, bool *bp) const MOZ_OVERRIDE; JS::Handle<jsid> id, bool *bp) const MOZ_OVERRIDE;
virtual bool enumerate(JSContext *cx, JS::Handle<JSObject*> wrapper, JS::AutoIdVector &props) const MOZ_OVERRIDE; virtual bool enumerate(JSContext *cx, JS::Handle<JSObject*> wrapper, JS::AutoIdVector &props) const MOZ_OVERRIDE;
virtual bool isExtensible(JSContext *cx, JS::Handle<JSObject*> wrapper, bool *extensible) const MOZ_OVERRIDE; virtual bool isExtensible(JSContext *cx, JS::Handle<JSObject*> wrapper, bool *extensible) const MOZ_OVERRIDE;
virtual bool preventExtensions(JSContext *cx, JS::Handle<JSObject*> wrapper, bool *succeeded) const MOZ_OVERRIDE; virtual bool preventExtensions(JSContext *cx, JS::Handle<JSObject*> wrapper) const MOZ_OVERRIDE;
virtual bool getPrototypeOf(JSContext *cx, JS::HandleObject wrapper, virtual bool getPrototypeOf(JSContext *cx, JS::HandleObject wrapper,
JS::MutableHandleObject protop) const MOZ_OVERRIDE; JS::MutableHandleObject protop) const MOZ_OVERRIDE;
virtual bool setPrototypeOf(JSContext *cx, JS::HandleObject wrapper, virtual bool setPrototypeOf(JSContext *cx, JS::HandleObject wrapper,