forked from mirrors/gecko-dev
6e6a50b7b8
This removes the non-standard `hasInstance` proxy trap. All objects will now use the algorithm in `JS::InstanceofOperator`. That function uses other primitives and proxy traps already available to JS code. As discussed in the bug, there's a minor difference in behavior: for `xrayWrapper instanceof xrayWaiver` we used to always return false but we can now invoke `xrayWaiver[Symbol.hasInstance]()`. Differential Revision: https://phabricator.services.mozilla.com/D142061
95 lines
3.4 KiB
C++
95 lines
3.4 KiB
C++
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* vim: set ts=8 sts=2 et sw=2 tw=80: */
|
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
#include "WaiveXrayWrapper.h"
|
|
#include "WrapperFactory.h"
|
|
#include "jsapi.h"
|
|
#include "js/CallAndConstruct.h" // JS::IsCallable
|
|
|
|
using namespace JS;
|
|
|
|
namespace xpc {
|
|
|
|
bool WaiveXrayWrapper::getOwnPropertyDescriptor(
|
|
JSContext* cx, HandleObject wrapper, HandleId id,
|
|
MutableHandle<mozilla::Maybe<PropertyDescriptor>> desc) const {
|
|
if (!CrossCompartmentWrapper::getOwnPropertyDescriptor(cx, wrapper, id,
|
|
desc)) {
|
|
return false;
|
|
}
|
|
|
|
if (desc.isNothing()) {
|
|
return true;
|
|
}
|
|
|
|
Rooted<PropertyDescriptor> desc_(cx, *desc);
|
|
if (desc_.hasValue()) {
|
|
if (!WrapperFactory::WaiveXrayAndWrap(cx, desc_.value())) {
|
|
return false;
|
|
}
|
|
}
|
|
if (desc_.hasGetter() && desc_.getter()) {
|
|
RootedValue v(cx, JS::ObjectValue(*desc_.getter()));
|
|
if (!WrapperFactory::WaiveXrayAndWrap(cx, &v)) {
|
|
return false;
|
|
}
|
|
desc_.setGetter(&v.toObject());
|
|
}
|
|
if (desc_.hasSetter() && desc_.setter()) {
|
|
RootedValue v(cx, JS::ObjectValue(*desc_.setter()));
|
|
if (!WrapperFactory::WaiveXrayAndWrap(cx, &v)) {
|
|
return false;
|
|
}
|
|
desc_.setSetter(&v.toObject());
|
|
}
|
|
|
|
desc.set(mozilla::Some(desc_.get()));
|
|
return true;
|
|
}
|
|
|
|
bool WaiveXrayWrapper::get(JSContext* cx, HandleObject wrapper,
|
|
HandleValue receiver, HandleId id,
|
|
MutableHandleValue vp) const {
|
|
return CrossCompartmentWrapper::get(cx, wrapper, receiver, id, vp) &&
|
|
WrapperFactory::WaiveXrayAndWrap(cx, vp);
|
|
}
|
|
|
|
bool WaiveXrayWrapper::call(JSContext* cx, HandleObject wrapper,
|
|
const JS::CallArgs& args) const {
|
|
return CrossCompartmentWrapper::call(cx, wrapper, args) &&
|
|
WrapperFactory::WaiveXrayAndWrap(cx, args.rval());
|
|
}
|
|
|
|
bool WaiveXrayWrapper::construct(JSContext* cx, HandleObject wrapper,
|
|
const JS::CallArgs& args) const {
|
|
return CrossCompartmentWrapper::construct(cx, wrapper, args) &&
|
|
WrapperFactory::WaiveXrayAndWrap(cx, args.rval());
|
|
}
|
|
|
|
// NB: This is important as the other side of a handshake with FieldGetter. See
|
|
// nsXBLProtoImplField.cpp.
|
|
bool WaiveXrayWrapper::nativeCall(JSContext* cx, JS::IsAcceptableThis test,
|
|
JS::NativeImpl impl,
|
|
const JS::CallArgs& args) const {
|
|
return CrossCompartmentWrapper::nativeCall(cx, test, impl, args) &&
|
|
WrapperFactory::WaiveXrayAndWrap(cx, args.rval());
|
|
}
|
|
|
|
bool WaiveXrayWrapper::getPrototype(JSContext* cx, HandleObject wrapper,
|
|
MutableHandleObject protop) const {
|
|
return CrossCompartmentWrapper::getPrototype(cx, wrapper, protop) &&
|
|
(!protop || WrapperFactory::WaiveXrayAndWrap(cx, protop));
|
|
}
|
|
|
|
bool WaiveXrayWrapper::getPrototypeIfOrdinary(
|
|
JSContext* cx, HandleObject wrapper, bool* isOrdinary,
|
|
MutableHandleObject protop) const {
|
|
return CrossCompartmentWrapper::getPrototypeIfOrdinary(cx, wrapper,
|
|
isOrdinary, protop) &&
|
|
(!protop || WrapperFactory::WaiveXrayAndWrap(cx, protop));
|
|
}
|
|
|
|
} // namespace xpc
|