#include "ExceptionCode.h"
#include "JSDOMBinding.h"
-#include "TestCustomNamedGetter.h"
+#include "JSDOMConstructor.h"
#include "wtf/text/AtomicString.h"
#include <runtime/Error.h>
+#include <runtime/FunctionPrototype.h>
#include <wtf/GetPtr.h>
using namespace JSC;
// Attributes
-JSC::EncodedJSValue jsTestCustomNamedGetterConstructor(JSC::ExecState*, JSC::JSObject*, JSC::EncodedJSValue, JSC::PropertyName);
+JSC::EncodedJSValue jsTestCustomNamedGetterConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
+bool setJSTestCustomNamedGetterConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
class JSTestCustomNamedGetterPrototype : public JSC::JSNonFinalObject {
public:
- typedef JSC::JSNonFinalObject Base;
+ using Base = JSC::JSNonFinalObject;
static JSTestCustomNamedGetterPrototype* create(JSC::VM& vm, JSC::JSGlobalObject* globalObject, JSC::Structure* structure)
{
JSTestCustomNamedGetterPrototype* ptr = new (NotNull, JSC::allocateCell<JSTestCustomNamedGetterPrototype>(vm.heap)) JSTestCustomNamedGetterPrototype(vm, globalObject, structure);
void finishCreation(JSC::VM&);
};
-class JSTestCustomNamedGetterConstructor : public DOMConstructorObject {
-private:
- JSTestCustomNamedGetterConstructor(JSC::Structure*, JSDOMGlobalObject*);
- void finishCreation(JSC::VM&, JSDOMGlobalObject*);
-
-public:
- typedef DOMConstructorObject Base;
- static JSTestCustomNamedGetterConstructor* create(JSC::VM& vm, JSC::Structure* structure, JSDOMGlobalObject* globalObject)
- {
- JSTestCustomNamedGetterConstructor* ptr = new (NotNull, JSC::allocateCell<JSTestCustomNamedGetterConstructor>(vm.heap)) JSTestCustomNamedGetterConstructor(structure, globalObject);
- ptr->finishCreation(vm, globalObject);
- return ptr;
- }
-
- DECLARE_INFO;
- static JSC::Structure* createStructure(JSC::VM& vm, JSC::JSGlobalObject* globalObject, JSC::JSValue prototype)
- {
- return JSC::Structure::create(vm, globalObject, prototype, JSC::TypeInfo(JSC::ObjectType, StructureFlags), info());
- }
-};
-
-/* Hash table */
-
-static const struct CompactHashIndex JSTestCustomNamedGetterTableIndex[2] = {
- { -1, -1 },
- { 0, -1 },
-};
-
-
-static const HashTableValue JSTestCustomNamedGetterTableValues[] =
-{
- { "constructor", DontEnum | ReadOnly, NoIntrinsic, { (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestCustomNamedGetterConstructor), (intptr_t) static_cast<PutPropertySlot::PutValueFunc>(0) } },
-};
-
-static const HashTable JSTestCustomNamedGetterTable = { 1, 1, true, JSTestCustomNamedGetterTableValues, JSTestCustomNamedGetterTableIndex };
-const ClassInfo JSTestCustomNamedGetterConstructor::s_info = { "TestCustomNamedGetterConstructor", &Base::s_info, 0, CREATE_METHOD_TABLE(JSTestCustomNamedGetterConstructor) };
+using JSTestCustomNamedGetterConstructor = JSDOMConstructorNotConstructable<JSTestCustomNamedGetter>;
-JSTestCustomNamedGetterConstructor::JSTestCustomNamedGetterConstructor(Structure* structure, JSDOMGlobalObject* globalObject)
- : DOMConstructorObject(structure, globalObject)
+template<> JSValue JSTestCustomNamedGetterConstructor::prototypeForStructure(JSC::VM& vm, const JSDOMGlobalObject& globalObject)
{
+ UNUSED_PARAM(vm);
+ return globalObject.functionPrototype();
}
-void JSTestCustomNamedGetterConstructor::finishCreation(VM& vm, JSDOMGlobalObject* globalObject)
+template<> void JSTestCustomNamedGetterConstructor::initializeProperties(VM& vm, JSDOMGlobalObject& globalObject)
{
- Base::finishCreation(vm);
- ASSERT(inherits(info()));
- putDirect(vm, vm.propertyNames->prototype, JSTestCustomNamedGetter::getPrototype(vm, globalObject), DontDelete | ReadOnly | DontEnum);
+ putDirect(vm, vm.propertyNames->prototype, JSTestCustomNamedGetter::prototype(vm, &globalObject), DontDelete | ReadOnly | DontEnum);
putDirect(vm, vm.propertyNames->name, jsNontrivialString(&vm, String(ASCIILiteral("TestCustomNamedGetter"))), ReadOnly | DontEnum);
putDirect(vm, vm.propertyNames->length, jsNumber(0), ReadOnly | DontEnum);
}
+template<> const ClassInfo JSTestCustomNamedGetterConstructor::s_info = { "TestCustomNamedGetter", &Base::s_info, 0, CREATE_METHOD_TABLE(JSTestCustomNamedGetterConstructor) };
+
/* Hash table for prototype */
static const HashTableValue JSTestCustomNamedGetterPrototypeTableValues[] =
{
+ { "constructor", DontEnum, NoIntrinsic, { (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestCustomNamedGetterConstructor), (intptr_t) static_cast<PutPropertySlot::PutValueFunc>(setJSTestCustomNamedGetterConstructor) } },
{ "anotherFunction", JSC::Function, NoIntrinsic, { (intptr_t)static_cast<NativeFunction>(jsTestCustomNamedGetterPrototypeFunctionAnotherFunction), (intptr_t) (1) } },
};
reifyStaticProperties(vm, JSTestCustomNamedGetterPrototypeTableValues, *this);
}
-const ClassInfo JSTestCustomNamedGetter::s_info = { "TestCustomNamedGetter", &Base::s_info, &JSTestCustomNamedGetterTable, CREATE_METHOD_TABLE(JSTestCustomNamedGetter) };
+const ClassInfo JSTestCustomNamedGetter::s_info = { "TestCustomNamedGetter", &Base::s_info, 0, CREATE_METHOD_TABLE(JSTestCustomNamedGetter) };
-JSTestCustomNamedGetter::JSTestCustomNamedGetter(Structure* structure, JSDOMGlobalObject* globalObject, Ref<TestCustomNamedGetter>&& impl)
- : JSDOMWrapper(structure, globalObject)
- , m_impl(&impl.leakRef())
+JSTestCustomNamedGetter::JSTestCustomNamedGetter(Structure* structure, JSDOMGlobalObject& globalObject, Ref<TestCustomNamedGetter>&& impl)
+ : JSDOMWrapper<TestCustomNamedGetter>(structure, globalObject, WTFMove(impl))
{
}
return JSTestCustomNamedGetterPrototype::create(vm, globalObject, JSTestCustomNamedGetterPrototype::createStructure(vm, globalObject, globalObject->objectPrototype()));
}
-JSObject* JSTestCustomNamedGetter::getPrototype(VM& vm, JSGlobalObject* globalObject)
+JSObject* JSTestCustomNamedGetter::prototype(VM& vm, JSGlobalObject* globalObject)
{
return getDOMPrototype<JSTestCustomNamedGetter>(vm, globalObject);
}
thisObject->JSTestCustomNamedGetter::~JSTestCustomNamedGetter();
}
-JSTestCustomNamedGetter::~JSTestCustomNamedGetter()
-{
- releaseImpl();
-}
-
bool JSTestCustomNamedGetter::getOwnPropertySlot(JSObject* object, ExecState* state, PropertyName propertyName, PropertySlot& slot)
{
auto* thisObject = jsCast<JSTestCustomNamedGetter*>(object);
ASSERT_GC_OBJECT_INHERITS(thisObject, info());
- if (getStaticValueSlot<JSTestCustomNamedGetter, Base>(state, JSTestCustomNamedGetterTable, thisObject, propertyName, slot))
+ if (Base::getOwnPropertySlot(thisObject, state, propertyName, slot))
return true;
- JSValue proto = thisObject->prototype();
+ JSValue proto = thisObject->getPrototypeDirect();
if (proto.isObject() && jsCast<JSObject*>(proto)->hasProperty(state, propertyName))
return false;
if (thisObject->classInfo() == info()) {
JSValue value;
if (thisObject->nameGetter(state, propertyName, value)) {
- slot.setValue(thisObject, ReadOnly | DontDelete | DontEnum, value);
+ slot.setValue(thisObject, ReadOnly | DontEnum, value);
return true;
}
}
return Base::getOwnPropertySlotByIndex(thisObject, state, index, slot);
}
-EncodedJSValue jsTestCustomNamedGetterConstructor(ExecState* state, JSObject*, EncodedJSValue thisValue, PropertyName)
+EncodedJSValue jsTestCustomNamedGetterConstructor(ExecState* state, EncodedJSValue thisValue, PropertyName)
{
- JSTestCustomNamedGetter* domObject = jsDynamicCast<JSTestCustomNamedGetter*>(JSValue::decode(thisValue));
- if (!domObject)
- return throwVMTypeError(state);
+ VM& vm = state->vm();
+ auto throwScope = DECLARE_THROW_SCOPE(vm);
+ JSTestCustomNamedGetterPrototype* domObject = jsDynamicCast<JSTestCustomNamedGetterPrototype*>(JSValue::decode(thisValue));
+ if (UNLIKELY(!domObject))
+ return throwVMTypeError(state, throwScope);
return JSValue::encode(JSTestCustomNamedGetter::getConstructor(state->vm(), domObject->globalObject()));
}
-JSValue JSTestCustomNamedGetter::getConstructor(VM& vm, JSGlobalObject* globalObject)
+bool setJSTestCustomNamedGetterConstructor(ExecState* state, EncodedJSValue thisValue, EncodedJSValue encodedValue)
{
- return getDOMConstructor<JSTestCustomNamedGetterConstructor>(vm, jsCast<JSDOMGlobalObject*>(globalObject));
+ VM& vm = state->vm();
+ auto throwScope = DECLARE_THROW_SCOPE(vm);
+ JSValue value = JSValue::decode(encodedValue);
+ JSTestCustomNamedGetterPrototype* domObject = jsDynamicCast<JSTestCustomNamedGetterPrototype*>(JSValue::decode(thisValue));
+ if (UNLIKELY(!domObject)) {
+ throwVMTypeError(state, throwScope);
+ return false;
+ }
+ // Shadowing a built-in constructor
+ return domObject->putDirect(state->vm(), state->propertyNames().constructor, value);
+}
+
+JSValue JSTestCustomNamedGetter::getConstructor(VM& vm, const JSGlobalObject* globalObject)
+{
+ return getDOMConstructor<JSTestCustomNamedGetterConstructor>(vm, *jsCast<const JSDOMGlobalObject*>(globalObject));
}
EncodedJSValue JSC_HOST_CALL jsTestCustomNamedGetterPrototypeFunctionAnotherFunction(ExecState* state)
{
+ VM& vm = state->vm();
+ auto throwScope = DECLARE_THROW_SCOPE(vm);
+ UNUSED_PARAM(throwScope);
JSValue thisValue = state->thisValue();
- JSTestCustomNamedGetter* castedThis = jsDynamicCast<JSTestCustomNamedGetter*>(thisValue);
+ auto castedThis = jsDynamicCast<JSTestCustomNamedGetter*>(thisValue);
if (UNLIKELY(!castedThis))
- return throwThisTypeError(*state, "TestCustomNamedGetter", "anotherFunction");
+ return throwThisTypeError(*state, throwScope, "TestCustomNamedGetter", "anotherFunction");
ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestCustomNamedGetter::info());
- auto& impl = castedThis->impl();
+ auto& impl = castedThis->wrapped();
if (UNLIKELY(state->argumentCount() < 1))
- return throwVMError(state, createNotEnoughArgumentsError(state));
- String str = state->argument(0).toString(state)->value(state);
- if (UNLIKELY(state->hadException()))
- return JSValue::encode(jsUndefined());
- impl.anotherFunction(str);
+ return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
+ auto str = state->uncheckedArgument(0).toWTFString(state);
+ RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
+ impl.anotherFunction(WTFMove(str));
return JSValue::encode(jsUndefined());
}
{
auto* jsTestCustomNamedGetter = jsCast<JSTestCustomNamedGetter*>(handle.slot()->asCell());
auto& world = *static_cast<DOMWrapperWorld*>(context);
- uncacheWrapper(world, &jsTestCustomNamedGetter->impl(), jsTestCustomNamedGetter);
+ uncacheWrapper(world, &jsTestCustomNamedGetter->wrapped(), jsTestCustomNamedGetter);
}
#if ENABLE(BINDING_INTEGRITY)
#endif
#endif
-JSC::JSValue toJSNewlyCreated(JSC::ExecState*, JSDOMGlobalObject* globalObject, TestCustomNamedGetter* impl)
+JSC::JSValue toJSNewlyCreated(JSC::ExecState*, JSDOMGlobalObject* globalObject, Ref<TestCustomNamedGetter>&& impl)
{
- if (!impl)
- return jsNull();
- return createNewWrapper<JSTestCustomNamedGetter>(globalObject, impl);
-}
-
-JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject* globalObject, TestCustomNamedGetter* impl)
-{
- if (!impl)
- return jsNull();
- if (JSValue result = getExistingWrapper<JSTestCustomNamedGetter>(globalObject, impl))
- return result;
#if ENABLE(BINDING_INTEGRITY)
- void* actualVTablePointer = *(reinterpret_cast<void**>(impl));
+ void* actualVTablePointer = *(reinterpret_cast<void**>(impl.ptr()));
#if PLATFORM(WIN)
void* expectedVTablePointer = reinterpret_cast<void*>(__identifier("??_7TestCustomNamedGetter@WebCore@@6B@"));
#else
#if COMPILER(CLANG)
// If this fails TestCustomNamedGetter does not have a vtable, so you need to add the
// ImplementationLacksVTable attribute to the interface definition
- COMPILE_ASSERT(__is_polymorphic(TestCustomNamedGetter), TestCustomNamedGetter_is_not_polymorphic);
+ static_assert(__is_polymorphic(TestCustomNamedGetter), "TestCustomNamedGetter is not polymorphic");
#endif
#endif
// If you hit this assertion you either have a use after free bug, or
// by adding the SkipVTableValidation attribute to the interface IDL definition
RELEASE_ASSERT(actualVTablePointer == expectedVTablePointer);
#endif
- return createNewWrapper<JSTestCustomNamedGetter>(globalObject, impl);
+ return createWrapper<TestCustomNamedGetter>(globalObject, WTFMove(impl));
+}
+
+JSC::JSValue toJS(JSC::ExecState* state, JSDOMGlobalObject* globalObject, TestCustomNamedGetter& impl)
+{
+ return wrap(state, globalObject, impl);
}
TestCustomNamedGetter* JSTestCustomNamedGetter::toWrapped(JSC::JSValue value)
{
if (auto* wrapper = jsDynamicCast<JSTestCustomNamedGetter*>(value))
- return &wrapper->impl();
+ return &wrapper->wrapped();
return nullptr;
}
git://git.webkit.org / WebKit-https.git / blobdiff