Diff
Modified: trunk/Source/WebCore/ChangeLog (292898 => 292899)
--- trunk/Source/WebCore/ChangeLog 2022-04-15 01:45:58 UTC (rev 292898)
+++ trunk/Source/WebCore/ChangeLog 2022-04-15 05:44:28 UTC (rev 292899)
@@ -1,3 +1,76 @@
+2022-04-14 Chris Dumez <cdu...@apple.com>
+
+ Use WebCoreBuiltinNames when possible
+ https://bugs.webkit.org/show_bug.cgi?id=239361
+
+ Reviewed by Yusuke Suzuki.
+
+ Use WebCoreBuiltinNames when possible to avoid unnecessary calls to Identifier::fromString().
+ This is more efficient.
+
+ * Modules/encryptedmedia/legacy/LegacyCDMSessionClearKey.cpp:
+ (WebCore::CDMSessionClearKey::update):
+ * bindings/js/JSDOMGlobalObject.cpp:
+ (WebCore::JSDOMGlobalObject::addBuiltinGlobals):
+ * bindings/js/JSDOMMapLike.cpp:
+ (WebCore::getBackingMap):
+ * bindings/js/JSDOMSetLike.cpp:
+ (WebCore::getBackingSet):
+ * bindings/js/JSDOMWindowBase.cpp:
+ (WebCore::JSDOMWindowBase::initStaticGlobals):
+ (WebCore::JSDOMWindowBase::finishCreation):
+ (WebCore::JSDOMWindowBase::updateDocument):
+ * bindings/js/JSDOMWindowCustom.cpp:
+ (WebCore::jsDOMWindowGetOwnPropertySlotRestrictedAccess):
+ (WebCore::JSDOMWindow::getOwnPropertySlot):
+ (WebCore::JSDOMWindow::put):
+ (WebCore::addCrossOriginPropertyNames):
+ (WebCore::JSDOMWindow::defineOwnProperty):
+ (WebCore::JSDOMWindow::setOpener):
+ (WebCore::JSDOMWindow::openDatabase const):
+ (WebCore::JSDOMWindow::setOpenDatabase):
+ * bindings/js/JSEventListener.cpp:
+ (WebCore::JSEventListener::handleEvent):
+ * bindings/js/JSLocationCustom.cpp:
+ (WebCore::getOwnPropertySlotCommon):
+ (WebCore::JSLocation::put):
+ * bindings/js/JSRemoteDOMWindowCustom.cpp:
+ (WebCore::JSRemoteDOMWindow::put):
+ * bindings/js/ReadableStream.cpp:
+ (WebCore::ReadableStream::create):
+ (WebCore::ReadableStream::lock):
+ * bindings/js/ScriptController.cpp:
+ (WebCore::ScriptController::setupModuleScriptHandlers):
+ * bindings/js/ScriptModuleLoader.cpp:
+ (WebCore::rejectToPropagateNetworkError):
+ (WebCore::rejectWithFetchError):
+ * bindings/js/WebCoreBuiltinNames.h:
+ * bindings/js/WebCoreJSClientData.h:
+ (WebCore::webCoreBuiltinNames):
+ * bindings/scripts/CodeGeneratorJS.pm:
+ (GenerateImplementation):
+ * bindings/scripts/test/JS/JSDOMWindow.cpp:
+ (WebCore::JSDOMWindow::finishCreation):
+ * bindings/scripts/test/JS/JSTestConditionallyReadWrite.cpp:
+ (WebCore::JSTestConditionallyReadWritePrototype::finishCreation):
+ (WebCore::JSTestConditionallyReadWrite::finishCreation):
+ * bindings/scripts/test/JS/JSTestEnabledBySetting.cpp:
+ (WebCore::JSTestEnabledBySetting::finishCreation):
+ * bindings/scripts/test/JS/JSTestEnabledForContext.cpp:
+ (WebCore::JSTestEnabledForContext::finishCreation):
+ * bindings/scripts/test/JS/JSTestGlobalObject.cpp:
+ (WebCore::JSTestGlobalObject::finishCreation):
+ * bindings/scripts/test/JS/JSTestObj.cpp:
+ (WebCore::JSTestObjPrototype::finishCreation):
+ * html/HTMLMediaElement.cpp:
+ (WebCore::controllerJSValue):
+ (WebCore::HTMLMediaElement::didAddUserAgentShadowRoot):
+ * testing/Internals.cpp:
+ (WebCore::Internals::cloneArrayBuffer):
+ * workers/WorkerOrWorkletScriptController.cpp:
+ (WebCore::WorkerOrWorkletScriptController::loadModuleSynchronously):
+ (WebCore::WorkerOrWorkletScriptController::loadAndEvaluateModule):
+
2022-04-14 Wenson Hsieh <wenson_hs...@apple.com>
Undo option after invoking "Markup Image" says "Undo Paste"
Modified: trunk/Source/WebCore/Modules/encryptedmedia/legacy/LegacyCDMSessionClearKey.cpp (292898 => 292899)
--- trunk/Source/WebCore/Modules/encryptedmedia/legacy/LegacyCDMSessionClearKey.cpp 2022-04-15 01:45:58 UTC (rev 292898)
+++ trunk/Source/WebCore/Modules/encryptedmedia/legacy/LegacyCDMSessionClearKey.cpp 2022-04-15 05:44:28 UTC (rev 292899)
@@ -30,6 +30,7 @@
#include "Logging.h"
#include <pal/text/TextEncoding.h>
#include "WebKitMediaKeyError.h"
+#include <_javascript_Core/BuiltinNames.h>
#include <_javascript_Core/JSGlobalObjectInlines.h>
#include <_javascript_Core/JSLock.h>
#include <_javascript_Core/JSONObject.h>
@@ -109,7 +110,7 @@
break;
}
- auto keysArrayValue = asObject(keysDataValue)->get(&lexicalGlobalObject, Identifier::fromString(vm, "keys"_s));
+ auto keysArrayValue = asObject(keysDataValue)->get(&lexicalGlobalObject, vm.propertyNames->builtinNames().keysPublicName());
if (scope.exception() || !isJSArray(keysArrayValue)) {
LOG(Media, "CDMSessionClearKey::update(%p) - failed: keys array missing or empty", this);
break;
Modified: trunk/Source/WebCore/bindings/js/JSDOMGlobalObject.cpp (292898 => 292899)
--- trunk/Source/WebCore/bindings/js/JSDOMGlobalObject.cpp 2022-04-15 01:45:58 UTC (rev 292898)
+++ trunk/Source/WebCore/bindings/js/JSDOMGlobalObject.cpp 2022-04-15 05:44:28 UTC (rev 292899)
@@ -214,31 +214,31 @@
{
m_builtinInternalFunctions.initialize(*this);
- JSVMClientData& clientData = *static_cast<JSVMClientData*>(vm.clientData);
+ auto& builtinNames = webCoreBuiltinNames(vm);
JSDOMGlobalObject::GlobalPropertyInfo staticGlobals[] = {
- JSDOMGlobalObject::GlobalPropertyInfo(clientData.builtinNames().makeThisTypeErrorPrivateName(),
+ JSDOMGlobalObject::GlobalPropertyInfo(builtinNames.makeThisTypeErrorPrivateName(),
JSFunction::create(vm, this, 2, String(), makeThisTypeErrorForBuiltins), PropertyAttribute::DontDelete | PropertyAttribute::ReadOnly),
- JSDOMGlobalObject::GlobalPropertyInfo(clientData.builtinNames().makeGetterTypeErrorPrivateName(),
+ JSDOMGlobalObject::GlobalPropertyInfo(builtinNames.makeGetterTypeErrorPrivateName(),
JSFunction::create(vm, this, 2, String(), makeGetterTypeErrorForBuiltins), PropertyAttribute::DontDelete | PropertyAttribute::ReadOnly),
- JSDOMGlobalObject::GlobalPropertyInfo(clientData.builtinNames().makeDOMExceptionPrivateName(),
+ JSDOMGlobalObject::GlobalPropertyInfo(builtinNames.makeDOMExceptionPrivateName(),
JSFunction::create(vm, this, 2, String(), makeDOMExceptionForBuiltins), PropertyAttribute::DontDelete | PropertyAttribute::ReadOnly),
- JSDOMGlobalObject::GlobalPropertyInfo(clientData.builtinNames().whenSignalAbortedPrivateName(),
+ JSDOMGlobalObject::GlobalPropertyInfo(builtinNames.whenSignalAbortedPrivateName(),
JSFunction::create(vm, this, 2, String(), whenSignalAborted), PropertyAttribute::DontDelete | PropertyAttribute::ReadOnly),
- JSDOMGlobalObject::GlobalPropertyInfo(clientData.builtinNames().cloneArrayBufferPrivateName(),
+ JSDOMGlobalObject::GlobalPropertyInfo(builtinNames.cloneArrayBufferPrivateName(),
JSFunction::create(vm, this, 3, String(), cloneArrayBuffer), PropertyAttribute::DontDelete | PropertyAttribute::ReadOnly),
- JSDOMGlobalObject::GlobalPropertyInfo(clientData.builtinNames().structuredCloneForStreamPrivateName(),
+ JSDOMGlobalObject::GlobalPropertyInfo(builtinNames.structuredCloneForStreamPrivateName(),
JSFunction::create(vm, this, 1, String(), structuredCloneForStream), PropertyAttribute::DontDelete | PropertyAttribute::ReadOnly),
JSDOMGlobalObject::GlobalPropertyInfo(vm.propertyNames->builtinNames().ArrayBufferPrivateName(), arrayBufferConstructor(), PropertyAttribute::DontDelete | PropertyAttribute::ReadOnly),
- JSDOMGlobalObject::GlobalPropertyInfo(clientData.builtinNames().streamClosedPrivateName(), jsNumber(1), PropertyAttribute::DontDelete | PropertyAttribute::ReadOnly),
- JSDOMGlobalObject::GlobalPropertyInfo(clientData.builtinNames().streamClosingPrivateName(), jsNumber(2), PropertyAttribute::DontDelete | PropertyAttribute::ReadOnly),
- JSDOMGlobalObject::GlobalPropertyInfo(clientData.builtinNames().streamErroredPrivateName(), jsNumber(3), PropertyAttribute::DontDelete | PropertyAttribute::ReadOnly),
- JSDOMGlobalObject::GlobalPropertyInfo(clientData.builtinNames().streamReadablePrivateName(), jsNumber(4), PropertyAttribute::DontDelete | PropertyAttribute::ReadOnly),
- JSDOMGlobalObject::GlobalPropertyInfo(clientData.builtinNames().streamWaitingPrivateName(), jsNumber(5), PropertyAttribute::DontDelete | PropertyAttribute::ReadOnly),
- JSDOMGlobalObject::GlobalPropertyInfo(clientData.builtinNames().streamWritablePrivateName(), jsNumber(6), PropertyAttribute::DontDelete | PropertyAttribute::ReadOnly),
- JSDOMGlobalObject::GlobalPropertyInfo(clientData.builtinNames().readableByteStreamAPIEnabledPrivateName(), JSFunction::create(vm, this, 0, String(), isReadableByteStreamAPIEnabled), PropertyAttribute::DontDelete | PropertyAttribute::ReadOnly),
- JSDOMGlobalObject::GlobalPropertyInfo(clientData.builtinNames().isAbortSignalPrivateName(), JSFunction::create(vm, this, 1, String(), isAbortSignal), PropertyAttribute::DontDelete | PropertyAttribute::ReadOnly),
- JSDOMGlobalObject::GlobalPropertyInfo(clientData.builtinNames().getInternalWritableStreamPrivateName(), JSFunction::create(vm, this, 1, String(), getInternalWritableStream), PropertyAttribute::DontDelete | PropertyAttribute::ReadOnly),
- JSDOMGlobalObject::GlobalPropertyInfo(clientData.builtinNames().createWritableStreamFromInternalPrivateName(), JSFunction::create(vm, this, 1, String(), createWritableStreamFromInternal), PropertyAttribute::DontDelete | PropertyAttribute::ReadOnly),
+ JSDOMGlobalObject::GlobalPropertyInfo(builtinNames.streamClosedPrivateName(), jsNumber(1), PropertyAttribute::DontDelete | PropertyAttribute::ReadOnly),
+ JSDOMGlobalObject::GlobalPropertyInfo(builtinNames.streamClosingPrivateName(), jsNumber(2), PropertyAttribute::DontDelete | PropertyAttribute::ReadOnly),
+ JSDOMGlobalObject::GlobalPropertyInfo(builtinNames.streamErroredPrivateName(), jsNumber(3), PropertyAttribute::DontDelete | PropertyAttribute::ReadOnly),
+ JSDOMGlobalObject::GlobalPropertyInfo(builtinNames.streamReadablePrivateName(), jsNumber(4), PropertyAttribute::DontDelete | PropertyAttribute::ReadOnly),
+ JSDOMGlobalObject::GlobalPropertyInfo(builtinNames.streamWaitingPrivateName(), jsNumber(5), PropertyAttribute::DontDelete | PropertyAttribute::ReadOnly),
+ JSDOMGlobalObject::GlobalPropertyInfo(builtinNames.streamWritablePrivateName(), jsNumber(6), PropertyAttribute::DontDelete | PropertyAttribute::ReadOnly),
+ JSDOMGlobalObject::GlobalPropertyInfo(builtinNames.readableByteStreamAPIEnabledPrivateName(), JSFunction::create(vm, this, 0, String(), isReadableByteStreamAPIEnabled), PropertyAttribute::DontDelete | PropertyAttribute::ReadOnly),
+ JSDOMGlobalObject::GlobalPropertyInfo(builtinNames.isAbortSignalPrivateName(), JSFunction::create(vm, this, 1, String(), isAbortSignal), PropertyAttribute::DontDelete | PropertyAttribute::ReadOnly),
+ JSDOMGlobalObject::GlobalPropertyInfo(builtinNames.getInternalWritableStreamPrivateName(), JSFunction::create(vm, this, 1, String(), getInternalWritableStream), PropertyAttribute::DontDelete | PropertyAttribute::ReadOnly),
+ JSDOMGlobalObject::GlobalPropertyInfo(builtinNames.createWritableStreamFromInternalPrivateName(), JSFunction::create(vm, this, 1, String(), createWritableStreamFromInternal), PropertyAttribute::DontDelete | PropertyAttribute::ReadOnly),
};
addStaticGlobals(staticGlobals, WTF_ARRAY_LENGTH(staticGlobals));
}
Modified: trunk/Source/WebCore/bindings/js/JSDOMMapLike.cpp (292898 => 292899)
--- trunk/Source/WebCore/bindings/js/JSDOMMapLike.cpp 2022-04-15 01:45:58 UTC (rev 292898)
+++ trunk/Source/WebCore/bindings/js/JSDOMMapLike.cpp 2022-04-15 05:44:28 UTC (rev 292899)
@@ -36,7 +36,7 @@
std::pair<bool, std::reference_wrapper<JSC::JSObject>> getBackingMap(JSC::JSGlobalObject& lexicalGlobalObject, JSC::JSObject& mapLike)
{
auto& vm = lexicalGlobalObject.vm();
- auto backingMap = mapLike.get(&lexicalGlobalObject, static_cast<JSVMClientData*>(vm.clientData)->builtinNames().backingMapPrivateName());
+ auto backingMap = mapLike.get(&lexicalGlobalObject, webCoreBuiltinNames(vm).backingMapPrivateName());
if (!backingMap.isUndefined())
return { false, *JSC::asObject(backingMap) };
@@ -46,7 +46,7 @@
backingMap = JSC::JSMap::create(&lexicalGlobalObject, vm, lexicalGlobalObject.mapStructure());
scope.releaseAssertNoException();
- mapLike.putDirect(vm, static_cast<JSVMClientData*>(vm.clientData)->builtinNames().backingMapPrivateName(), backingMap, static_cast<unsigned>(JSC::PropertyAttribute::DontEnum));
+ mapLike.putDirect(vm, webCoreBuiltinNames(vm).backingMapPrivateName(), backingMap, static_cast<unsigned>(JSC::PropertyAttribute::DontEnum));
return { true, *JSC::asObject(backingMap) };
}
Modified: trunk/Source/WebCore/bindings/js/JSDOMSetLike.cpp (292898 => 292899)
--- trunk/Source/WebCore/bindings/js/JSDOMSetLike.cpp 2022-04-15 01:45:58 UTC (rev 292898)
+++ trunk/Source/WebCore/bindings/js/JSDOMSetLike.cpp 2022-04-15 05:44:28 UTC (rev 292899)
@@ -42,7 +42,7 @@
std::pair<bool, std::reference_wrapper<JSC::JSObject>> getBackingSet(JSC::JSGlobalObject& lexicalGlobalObject, JSC::JSObject& setLike)
{
auto& vm = lexicalGlobalObject.vm();
- auto backingSet = setLike.get(&lexicalGlobalObject, static_cast<JSVMClientData*>(vm.clientData)->builtinNames().backingSetPrivateName());
+ auto backingSet = setLike.get(&lexicalGlobalObject, webCoreBuiltinNames(vm).backingSetPrivateName());
if (backingSet.isUndefined()) {
auto& vm = lexicalGlobalObject.vm();
JSC::DeferTermination deferScope(vm);
@@ -51,7 +51,7 @@
backingSet = JSC::JSSet::create(&lexicalGlobalObject, vm, lexicalGlobalObject.setStructure());
scope.releaseAssertNoException();
- setLike.putDirect(vm, static_cast<JSVMClientData*>(vm.clientData)->builtinNames().backingSetPrivateName(), backingSet, static_cast<unsigned>(JSC::PropertyAttribute::DontEnum));
+ setLike.putDirect(vm, webCoreBuiltinNames(vm).backingSetPrivateName(), backingSet, static_cast<unsigned>(JSC::PropertyAttribute::DontEnum));
return { true, *JSC::asObject(backingSet) };
}
return { false, *JSC::asObject(backingSet) };
Modified: trunk/Source/WebCore/bindings/js/JSDOMWindowBase.cpp (292898 => 292899)
--- trunk/Source/WebCore/bindings/js/JSDOMWindowBase.cpp 2022-04-15 01:45:58 UTC (rev 292898)
+++ trunk/Source/WebCore/bindings/js/JSDOMWindowBase.cpp 2022-04-15 05:44:28 UTC (rev 292899)
@@ -108,7 +108,7 @@
SUPPRESS_ASAN inline void JSDOMWindowBase::initStaticGlobals(JSC::VM& vm)
{
- auto& builtinNames = static_cast<JSVMClientData*>(vm.clientData)->builtinNames();
+ auto& builtinNames = webCoreBuiltinNames(vm);
GlobalPropertyInfo staticGlobals[] = {
GlobalPropertyInfo(builtinNames.documentPublicName(), jsNull(), PropertyAttribute::DontDelete | PropertyAttribute::ReadOnly),
@@ -128,7 +128,7 @@
if (m_wrapped && m_wrapped->frame() && m_wrapped->frame()->settings().needsSiteSpecificQuirks())
setNeedsSiteSpecificQuirks(true);
- putDirectCustomAccessor(vm, static_cast<JSVMClientData*>(vm.clientData)->builtinNames().showModalDialogPublicName(), CustomGetterSetter::create(vm, showModalDialogGetter, nullptr), static_cast<unsigned>(PropertyAttribute::CustomValue));
+ putDirectCustomAccessor(vm, webCoreBuiltinNames(vm).showModalDialogPublicName(), CustomGetterSetter::create(vm, showModalDialogGetter, nullptr), static_cast<unsigned>(PropertyAttribute::CustomValue));
}
void JSDOMWindowBase::destroy(JSCell* cell)
@@ -149,7 +149,7 @@
bool shouldThrowReadOnlyError = false;
bool ignoreReadOnlyErrors = true;
bool putResult = false;
- symbolTablePutTouchWatchpointSet(this, lexicalGlobalObject, static_cast<JSVMClientData*>(vm.clientData)->builtinNames().documentPublicName(), toJS(lexicalGlobalObject, this, m_wrapped->document()), shouldThrowReadOnlyError, ignoreReadOnlyErrors, putResult);
+ symbolTablePutTouchWatchpointSet(this, lexicalGlobalObject, webCoreBuiltinNames(vm).documentPublicName(), toJS(lexicalGlobalObject, this, m_wrapped->document()), shouldThrowReadOnlyError, ignoreReadOnlyErrors, putResult);
EXCEPTION_ASSERT_UNUSED(scope, !scope.exception());
}
Modified: trunk/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp (292898 => 292899)
--- trunk/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp 2022-04-15 01:45:58 UTC (rev 292898)
+++ trunk/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp 2022-04-15 05:44:28 UTC (rev 292899)
@@ -113,7 +113,7 @@
VM& vm = lexicalGlobalObject.vm();
auto scope = DECLARE_THROW_SCOPE(vm);
- auto& builtinNames = static_cast<JSVMClientData*>(vm.clientData)->builtinNames();
+ auto& builtinNames = webCoreBuiltinNames(vm);
// https://html.spec.whatwg.org/#crossorigingetownpropertyhelper-(-o,-p-)
@@ -214,7 +214,7 @@
return false;
#if ENABLE(USER_MESSAGE_HANDLERS)
- if (propertyName == static_cast<JSVMClientData*>(lexicalGlobalObject->vm().clientData)->builtinNames().webkitPublicName() && thisObject->wrapped().shouldHaveWebKitNamespaceForWorld(thisObject->world())) {
+ if (propertyName == webCoreBuiltinNames(lexicalGlobalObject->vm()).webkitPublicName() && thisObject->wrapped().shouldHaveWebKitNamespaceForWorld(thisObject->world())) {
slot.setCacheableCustom(thisObject, JSC::PropertyAttribute::DontDelete | JSC::PropertyAttribute::ReadOnly, jsDOMWindow_webkit);
return true;
}
@@ -255,7 +255,7 @@
String errorMessage;
if (!BindingSecurity::shouldAllowAccessToDOMWindow(*lexicalGlobalObject, thisObject->wrapped(), errorMessage)) {
// We only allow setting "location" attribute cross-origin.
- if (propertyName == static_cast<JSVMClientData*>(vm.clientData)->builtinNames().locationPublicName()) {
+ if (propertyName == webCoreBuiltinNames(vm).locationPublicName()) {
auto* setter = s_info.staticPropHashTable->entry(propertyName)->propertyPutter();
scope.release();
setter(lexicalGlobalObject, JSValue::encode(slot.thisValue()), JSValue::encode(value), propertyName);
@@ -327,7 +327,7 @@
template <CrossOriginObject objectType>
static void addCrossOriginPropertyNames(VM& vm, PropertyNameArray& propertyNames)
{
- auto& builtinNames = static_cast<JSVMClientData*>(vm.clientData)->builtinNames();
+ auto& builtinNames = webCoreBuiltinNames(vm);
switch (objectType) {
case CrossOriginObject::Location: {
static const Identifier* const properties[] = { &builtinNames.hrefPublicName(), &vm.propertyNames->replace };
@@ -413,7 +413,7 @@
return typeError(lexicalGlobalObject, scope, shouldThrow, makeUnsupportedIndexedSetterErrorMessage("Window"));
scope.release();
- auto& builtinNames = static_cast<JSVMClientData*>(vm.clientData)->builtinNames();
+ auto& builtinNames = webCoreBuiltinNames(vm);
if (propertyName == builtinNames.documentPublicName() || propertyName == builtinNames.windowPublicName())
return JSObject::defineOwnProperty(thisObject, lexicalGlobalObject, propertyName, descriptor, shouldThrow);
@@ -586,7 +586,7 @@
}
bool shouldThrow = true;
- createDataProperty(&lexicalGlobalObject, Identifier::fromString(lexicalGlobalObject.vm(), "opener"_s), value, shouldThrow);
+ createDataProperty(&lexicalGlobalObject, webCoreBuiltinNames(lexicalGlobalObject.vm()).openerPublicName(), value, shouldThrow);
}
JSValue JSDOMWindow::self(JSC::JSGlobalObject&) const
@@ -644,7 +644,7 @@
JSValue JSDOMWindow::openDatabase(JSC::JSGlobalObject& lexicalGlobalObject) const
{
VM& vm = lexicalGlobalObject.vm();
- StringImpl* name = PropertyName(static_cast<JSVMClientData*>(vm.clientData)->builtinNames().openDatabasePublicName()).publicName();
+ StringImpl* name = PropertyName(webCoreBuiltinNames(vm).openDatabasePublicName()).publicName();
if (RuntimeEnabledFeatures::sharedFeatures().webSQLEnabled())
return JSFunction::create(vm, &lexicalGlobalObject, 4, name, jsDOMWindowInstanceFunction_openDatabase, NoIntrinsic);
@@ -657,7 +657,7 @@
return;
bool shouldThrow = true;
- createDataProperty(&lexicalGlobalObject, Identifier::fromString(lexicalGlobalObject.vm(), "openDatabase"_s), value, shouldThrow);
+ createDataProperty(&lexicalGlobalObject, webCoreBuiltinNames(lexicalGlobalObject.vm()).openDatabasePublicName(), value, shouldThrow);
}
JSDOMWindow& mainWorldGlobalObject(Frame& frame)
Modified: trunk/Source/WebCore/bindings/js/JSEventListener.cpp (292898 => 292899)
--- trunk/Source/WebCore/bindings/js/JSEventListener.cpp 2022-04-15 01:45:58 UTC (rev 292898)
+++ trunk/Source/WebCore/bindings/js/JSEventListener.cpp 2022-04-15 05:44:28 UTC (rev 292899)
@@ -35,6 +35,7 @@
#include "JSExecStateInstrumentation.h"
#include "JSWorkerGlobalScope.h"
#include "ScriptController.h"
+#include "WebCoreJSClientData.h"
#include "WorkerGlobalScope.h"
#include <_javascript_Core/ExceptionHelpers.h>
#include <_javascript_Core/JSLock.h>
@@ -186,7 +187,7 @@
if (m_isAttribute)
return;
- handleEventFunction = jsFunction->get(lexicalGlobalObject, Identifier::fromString(vm, "handleEvent"_s));
+ handleEventFunction = jsFunction->get(lexicalGlobalObject, webCoreBuiltinNames(vm).handleEventPublicName());
if (UNLIKELY(scope.exception())) {
auto* exception = scope.exception();
scope.clearException();
Modified: trunk/Source/WebCore/bindings/js/JSLocationCustom.cpp (292898 => 292899)
--- trunk/Source/WebCore/bindings/js/JSLocationCustom.cpp 2022-04-15 01:45:58 UTC (rev 292898)
+++ trunk/Source/WebCore/bindings/js/JSLocationCustom.cpp 2022-04-15 05:44:28 UTC (rev 292899)
@@ -63,7 +63,7 @@
// Getting location.href cross origin needs to throw. However, getOwnPropertyDescriptor() needs to return
// a descriptor that has a setter but no getter.
- if (slot.internalMethodType() == PropertySlot::InternalMethodType::GetOwnProperty && propertyName == static_cast<JSVMClientData*>(vm.clientData)->builtinNames().hrefPublicName()) {
+ if (slot.internalMethodType() == PropertySlot::InternalMethodType::GetOwnProperty && propertyName == webCoreBuiltinNames(vm).hrefPublicName()) {
auto* entry = JSLocation::info()->staticPropHashTable->entry(propertyName);
auto* getterSetter = thisObject.globalObject()->createCrossOriginGetterSetter(&lexicalGlobalObject, propertyName, nullptr, entry->propertyPutter());
slot.setGetterSlot(&thisObject, PropertyAttribute::Accessor | PropertyAttribute::DontEnum, getterSetter);
@@ -120,7 +120,7 @@
// So fall through to the access check for those.
String errorMessage;
if (!BindingSecurity::shouldAllowAccessToDOMWindow(*lexicalGlobalObject, thisObject->wrapped().window(), errorMessage)) {
- if (propertyName == static_cast<JSVMClientData*>(vm.clientData)->builtinNames().hrefPublicName()) {
+ if (propertyName == webCoreBuiltinNames(vm).hrefPublicName()) {
auto* setter = s_info.staticPropHashTable->entry(propertyName)->propertyPutter();
scope.release();
setter(lexicalGlobalObject, JSValue::encode(putPropertySlot.thisValue()), JSValue::encode(value), propertyName);
Modified: trunk/Source/WebCore/bindings/js/JSRemoteDOMWindowCustom.cpp (292898 => 292899)
--- trunk/Source/WebCore/bindings/js/JSRemoteDOMWindowCustom.cpp 2022-04-15 01:45:58 UTC (rev 292898)
+++ trunk/Source/WebCore/bindings/js/JSRemoteDOMWindowCustom.cpp 2022-04-15 05:44:28 UTC (rev 292899)
@@ -67,7 +67,7 @@
String errorMessage;
// We only allow setting "location" attribute cross-origin.
- if (propertyName == static_cast<JSVMClientData*>(vm.clientData)->builtinNames().locationPublicName()) {
+ if (propertyName == webCoreBuiltinNames(vm).locationPublicName()) {
auto* setter = s_info.staticPropHashTable->entry(propertyName)->propertyPutter();
scope.release();
setter(lexicalGlobalObject, JSValue::encode(slot.thisValue()), JSValue::encode(value), propertyName);
Modified: trunk/Source/WebCore/bindings/js/ReadableStream.cpp (292898 => 292899)
--- trunk/Source/WebCore/bindings/js/ReadableStream.cpp 2022-04-15 01:45:58 UTC (rev 292898)
+++ trunk/Source/WebCore/bindings/js/ReadableStream.cpp 2022-04-15 05:44:28 UTC (rev 292899)
@@ -66,9 +66,9 @@
ExceptionOr<Ref<ReadableStream>> ReadableStream::create(JSC::JSGlobalObject& lexicalGlobalObject, RefPtr<ReadableStreamSource>&& source)
{
- auto& clientData = *static_cast<JSVMClientData*>(lexicalGlobalObject.vm().clientData);
+ auto& builtinNames = webCoreBuiltinNames(lexicalGlobalObject.vm());
- auto objectOrException = invokeConstructor(lexicalGlobalObject, clientData.builtinNames().ReadableStreamPrivateName(), [&source](auto& args, auto& lexicalGlobalObject, auto& globalObject) {
+ auto objectOrException = invokeConstructor(lexicalGlobalObject, builtinNames.ReadableStreamPrivateName(), [&source](auto& args, auto& lexicalGlobalObject, auto& globalObject) {
args.append(source ? toJSNewlyCreated(&lexicalGlobalObject, &globalObject, source.releaseNonNull()) : JSC::jsUndefined());
});
@@ -130,8 +130,8 @@
void ReadableStream::lock()
{
- auto& clientData = *static_cast<JSVMClientData*>(m_globalObject->vm().clientData);
- invokeConstructor(*m_globalObject, clientData.builtinNames().ReadableStreamDefaultReaderPrivateName(), [this](auto& args, auto&, auto&) {
+ auto& builtinNames = webCoreBuiltinNames(m_globalObject->vm());
+ invokeConstructor(*m_globalObject, builtinNames.ReadableStreamDefaultReaderPrivateName(), [this](auto& args, auto&, auto&) {
args.append(readableStream());
});
}
Modified: trunk/Source/WebCore/bindings/js/ScriptController.cpp (292898 => 292899)
--- trunk/Source/WebCore/bindings/js/ScriptController.cpp 2022-04-15 01:45:58 UTC (rev 292898)
+++ trunk/Source/WebCore/bindings/js/ScriptController.cpp 2022-04-15 05:44:28 UTC (rev 292899)
@@ -336,7 +336,7 @@
auto scope = DECLARE_CATCH_SCOPE(vm);
if (errorValue.isObject()) {
auto* object = JSC::asObject(errorValue);
- if (JSValue failureKindValue = object->getDirect(vm, static_cast<JSVMClientData&>(*vm.clientData).builtinNames().failureKindPrivateName())) {
+ if (JSValue failureKindValue = object->getDirect(vm, webCoreBuiltinNames(vm).failureKindPrivateName())) {
// This is host propagated error in the module loader pipeline.
switch (static_cast<ModuleFetchFailureKind>(failureKindValue.asInt32())) {
case ModuleFetchFailureKind::WasPropagatedError:
Modified: trunk/Source/WebCore/bindings/js/ScriptModuleLoader.cpp (292898 => 292899)
--- trunk/Source/WebCore/bindings/js/ScriptModuleLoader.cpp 2022-04-15 01:45:58 UTC (rev 292898)
+++ trunk/Source/WebCore/bindings/js/ScriptModuleLoader.cpp 2022-04-15 05:44:28 UTC (rev 292899)
@@ -151,7 +151,7 @@
// https://bugs.webkit.org/show_bug.cgi?id=167553
auto* error = JSC::createTypeError(&jsGlobalObject, message);
ASSERT(error);
- error->putDirect(vm, static_cast<JSVMClientData&>(*vm.clientData).builtinNames().failureKindPrivateName(), JSC::jsNumber(static_cast<int32_t>(failureKind)));
+ error->putDirect(vm, webCoreBuiltinNames(vm).failureKindPrivateName(), JSC::jsNumber(static_cast<int32_t>(failureKind)));
return error;
});
}
@@ -163,7 +163,7 @@
JSC::VM& vm = jsGlobalObject.vm();
JSC::JSObject* error = jsCast<JSC::JSObject*>(createDOMException(&jsGlobalObject, ec, message));
ASSERT(error);
- error->putDirect(vm, static_cast<JSVMClientData&>(*vm.clientData).builtinNames().failureKindPrivateName(), JSC::jsNumber(static_cast<int32_t>(ModuleFetchFailureKind::WasFetchError)));
+ error->putDirect(vm, webCoreBuiltinNames(vm).failureKindPrivateName(), JSC::jsNumber(static_cast<int32_t>(ModuleFetchFailureKind::WasFetchError)));
return error;
});
}
Modified: trunk/Source/WebCore/bindings/js/WebCoreBuiltinNames.h (292898 => 292899)
--- trunk/Source/WebCore/bindings/js/WebCoreBuiltinNames.h 2022-04-15 01:45:58 UTC (rev 292898)
+++ trunk/Source/WebCore/bindings/js/WebCoreBuiltinNames.h 2022-04-15 05:44:28 UTC (rev 292899)
@@ -473,6 +473,7 @@
macro(getTracks) \
macro(getUserMedia) \
macro(gpu) \
+ macro(handleEvent) \
macro(header) \
macro(highWaterMark) \
macro(href) \
Modified: trunk/Source/WebCore/bindings/js/WebCoreJSClientData.h (292898 => 292899)
--- trunk/Source/WebCore/bindings/js/WebCoreJSClientData.h 2022-04-15 01:45:58 UTC (rev 292898)
+++ trunk/Source/WebCore/bindings/js/WebCoreJSClientData.h 2022-04-15 05:44:28 UTC (rev 292899)
@@ -208,4 +208,9 @@
return clientSpace;
}
+ALWAYS_INLINE WebCoreBuiltinNames& webCoreBuiltinNames(JSC::VM& vm)
+{
+ return static_cast<JSVMClientData*>(vm.clientData)->builtinNames();
+}
+
} // namespace WebCore
Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (292898 => 292899)
--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2022-04-15 01:45:58 UTC (rev 292898)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2022-04-15 05:44:28 UTC (rev 292899)
@@ -4608,10 +4608,10 @@
push(@implContent, " if (!${runtimeEnableConditionalString})\n");
if (IsAcceleratedDOMAttribute($interface, $attribute)) {
my $classForThis = "${className}::info()";
- push(@implContent, " putDirectCustomAccessor(vm, static_cast<JSVMClientData*>(vm.clientData)->builtinNames()." . $attributeName . "PublicName(), JSC::DOMAttributeGetterSetter::create(vm, $getter, $setter, JSC::DOMAttributeAnnotation { $classForThis, nullptr }), attributesForStructure($jscAttributes));\n");
+ push(@implContent, " putDirectCustomAccessor(vm, webCoreBuiltinNames(vm)." . $attributeName . "PublicName(), JSC::DOMAttributeGetterSetter::create(vm, $getter, $setter, JSC::DOMAttributeAnnotation { $classForThis, nullptr }), attributesForStructure($jscAttributes));\n");
} else {
assert("CustomGetterSetter is not allowed for DOMAttribute. DOMAttributeGetterSetter must be used.") if IsAcceleratedDOMAttribute($interface, $attribute);
- push(@implContent, " putDirectCustomAccessor(vm, static_cast<JSVMClientData*>(vm.clientData)->builtinNames()." . $attributeName . "PublicName(), CustomGetterSetter::create(vm, $getter, $setter), attributesForStructure($jscAttributes));\n");
+ push(@implContent, " putDirectCustomAccessor(vm, webCoreBuiltinNames(vm)." . $attributeName . "PublicName(), CustomGetterSetter::create(vm, $getter, $setter), attributesForStructure($jscAttributes));\n");
}
push(@implContent, "#endif\n") if $conditionalString;
}
@@ -4627,7 +4627,7 @@
AddToImplIncludes("WebCoreJSClientData.h");
my $conditionalString = $codeGenerator->GenerateConditionalString($operation);
push(@implContent, "#if ${conditionalString}\n") if $conditionalString;
- push(@implContent, " putDirect(vm, static_cast<JSVMClientData*>(vm.clientData)->builtinNames()." . $operation->name . "PrivateName(), JSFunction::create(vm, globalObject(), 0, String(), " . GetFunctionName($interface, $className, $operation) . "), JSC::PropertyAttribute::ReadOnly | JSC::PropertyAttribute::DontEnum);\n");
+ push(@implContent, " putDirect(vm, webCoreBuiltinNames(vm)." . $operation->name . "PrivateName(), JSFunction::create(vm, globalObject(), 0, String(), " . GetFunctionName($interface, $className, $operation) . "), JSC::PropertyAttribute::ReadOnly | JSC::PropertyAttribute::DontEnum);\n");
push(@implContent, "#endif\n") if $conditionalString;
}
@@ -4746,10 +4746,10 @@
assert("CustomGetterSetter is not allowed for DOMAttribute. DOMAttributeGetterSetter must be used.") if IsAcceleratedDOMAttribute($interface, $attribute);
if ($attribute->extendedAttributes->{PublicIdentifier} || !$attribute->extendedAttributes->{PrivateIdentifier}) {
- push(@implContent, " putDirectCustomAccessor(vm, static_cast<JSVMClientData*>(vm.clientData)->builtinNames()." . $attributeName . "PublicName(), CustomGetterSetter::create(vm, $getter, $setter), attributesForStructure($jscAttributes));\n");
+ push(@implContent, " putDirectCustomAccessor(vm, webCoreBuiltinNames(vm)." . $attributeName . "PublicName(), CustomGetterSetter::create(vm, $getter, $setter), attributesForStructure($jscAttributes));\n");
}
if ($attribute->extendedAttributes->{PrivateIdentifier}) {
- push(@implContent, " putDirectCustomAccessor(vm, static_cast<JSVMClientData*>(vm.clientData)->builtinNames()." . $attributeName . "PrivateName(), CustomGetterSetter::create(vm, $getter, $setter), attributesForStructure($jscAttributes));\n");
+ push(@implContent, " putDirectCustomAccessor(vm, webCoreBuiltinNames(vm)." . $attributeName . "PrivateName(), CustomGetterSetter::create(vm, $getter, $setter), attributesForStructure($jscAttributes));\n");
}
push(@implContent, " }\n") if $isPrivateAndPublic;
@@ -4769,7 +4769,7 @@
push(@implContent, "#if ${conditionalString}\n") if $conditionalString;
assert("CustomGetterSetter is not allowed for DOMAttribute. DOMAttributeGetterSetter must be used.") if IsAcceleratedDOMAttribute($interface, $attribute);
- push(@implContent, " putDirectCustomAccessor(vm, static_cast<JSVMClientData*>(vm.clientData)->builtinNames()." . $attributeName . "PrivateName(), CustomGetterSetter::create(vm, $getter, nullptr), attributesForStructure(JSC::PropertyAttribute::DontDelete | JSC::PropertyAttribute::ReadOnly));\n");
+ push(@implContent, " putDirectCustomAccessor(vm, webCoreBuiltinNames(vm)." . $attributeName . "PrivateName(), CustomGetterSetter::create(vm, $getter, nullptr), attributesForStructure(JSC::PropertyAttribute::DontDelete | JSC::PropertyAttribute::ReadOnly));\n");
push(@implContent, "#endif\n") if $conditionalString;
}
@@ -4789,7 +4789,7 @@
my $conditionalString = $codeGenerator->GenerateConditionalString($operation);
push(@implContent, "#if ${conditionalString}\n") if $conditionalString;
push(@implContent, " if (${runtimeEnableConditionalString})\n");
- my $propertyName = "static_cast<JSVMClientData*>(vm.clientData)->builtinNames()." . $functionName . ($operation->extendedAttributes->{PrivateIdentifier} ? "PrivateName()" : "PublicName()");
+ my $propertyName = "webCoreBuiltinNames(vm)." . $functionName . ($operation->extendedAttributes->{PrivateIdentifier} ? "PrivateName()" : "PublicName()");
if (IsJSBuiltin($interface, $operation)) {
push(@implContent, " putDirectBuiltinFunction(vm, this, $propertyName, $implementationFunction(vm), attributesForStructure($jsAttributes));\n");
} else {
Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSDOMWindow.cpp (292898 => 292899)
--- trunk/Source/WebCore/bindings/scripts/test/JS/JSDOMWindow.cpp 2022-04-15 01:45:58 UTC (rev 292898)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSDOMWindow.cpp 2022-04-15 05:44:28 UTC (rev 292899)
@@ -200,7 +200,7 @@
static_assert(!std::is_base_of<ActiveDOMObject, DOMWindow>::value, "Interface is not marked as [ActiveDOMObject] even though implementation class subclasses ActiveDOMObject.");
if ((jsCast<JSDOMGlobalObject*>(globalObject())->scriptExecutionContext()->isSecureContext() && TestEnabledForContext::enabledForContext(*jsCast<JSDOMGlobalObject*>(globalObject())->scriptExecutionContext())))
- putDirectCustomAccessor(vm, static_cast<JSVMClientData*>(vm.clientData)->builtinNames().TestEnabledForContextPublicName(), CustomGetterSetter::create(vm, jsDOMWindow_TestEnabledForContextConstructor, nullptr), attributesForStructure(static_cast<unsigned>(JSC::PropertyAttribute::DontEnum)));
+ putDirectCustomAccessor(vm, webCoreBuiltinNames(vm).TestEnabledForContextPublicName(), CustomGetterSetter::create(vm, jsDOMWindow_TestEnabledForContextConstructor, nullptr), attributesForStructure(static_cast<unsigned>(JSC::PropertyAttribute::DontEnum)));
}
JSValue JSDOMWindow::getConstructor(VM& vm, const JSGlobalObject* globalObject)
Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestConditionallyReadWrite.cpp (292898 => 292899)
--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestConditionallyReadWrite.cpp 2022-04-15 01:45:58 UTC (rev 292898)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestConditionallyReadWrite.cpp 2022-04-15 05:44:28 UTC (rev 292899)
@@ -218,16 +218,16 @@
}
// Adding back attribute, but as readonly, after removing the read-write variant above.
if (!RuntimeEnabledFeatures::sharedFeatures().testFeatureEnabled())
- putDirectCustomAccessor(vm, static_cast<JSVMClientData*>(vm.clientData)->builtinNames().runtimeConditionallyReadWriteAttributePublicName(), JSC::DOMAttributeGetterSetter::create(vm, jsTestConditionallyReadWrite_runtimeConditionallyReadWriteAttribute, nullptr, JSC::DOMAttributeAnnotation { JSTestConditionallyReadWrite::info(), nullptr }), attributesForStructure(static_cast<unsigned>(JSC::PropertyAttribute::CustomAccessor | JSC::PropertyAttribute::DOMAttribute)));
+ putDirectCustomAccessor(vm, webCoreBuiltinNames(vm).runtimeConditionallyReadWriteAttributePublicName(), JSC::DOMAttributeGetterSetter::create(vm, jsTestConditionallyReadWrite_runtimeConditionallyReadWriteAttribute, nullptr, JSC::DOMAttributeAnnotation { JSTestConditionallyReadWrite::info(), nullptr }), attributesForStructure(static_cast<unsigned>(JSC::PropertyAttribute::CustomAccessor | JSC::PropertyAttribute::DOMAttribute)));
// Adding back attribute, but as readonly, after removing the read-write variant above.
if (!RuntimeEnabledFeatures::sharedFeatures().testFeatureEnabled())
- putDirectCustomAccessor(vm, static_cast<JSVMClientData*>(vm.clientData)->builtinNames().runtimeConditionallyReadWriteAttributePromisePublicName(), CustomGetterSetter::create(vm, jsTestConditionallyReadWrite_runtimeConditionallyReadWriteAttributePromise, nullptr), attributesForStructure(static_cast<unsigned>(JSC::PropertyAttribute::CustomAccessor)));
+ putDirectCustomAccessor(vm, webCoreBuiltinNames(vm).runtimeConditionallyReadWriteAttributePromisePublicName(), CustomGetterSetter::create(vm, jsTestConditionallyReadWrite_runtimeConditionallyReadWriteAttributePromise, nullptr), attributesForStructure(static_cast<unsigned>(JSC::PropertyAttribute::CustomAccessor)));
// Adding back attribute, but as readonly, after removing the read-write variant above.
if (!downcast<Document>(jsCast<JSDOMGlobalObject*>(globalObject())->scriptExecutionContext())->settingsValues().testFeatureEnabled)
- putDirectCustomAccessor(vm, static_cast<JSVMClientData*>(vm.clientData)->builtinNames().settingsConditionallyReadWriteAttributePublicName(), JSC::DOMAttributeGetterSetter::create(vm, jsTestConditionallyReadWrite_settingsConditionallyReadWriteAttribute, nullptr, JSC::DOMAttributeAnnotation { JSTestConditionallyReadWrite::info(), nullptr }), attributesForStructure(static_cast<unsigned>(JSC::PropertyAttribute::CustomAccessor | JSC::PropertyAttribute::DOMAttribute)));
+ putDirectCustomAccessor(vm, webCoreBuiltinNames(vm).settingsConditionallyReadWriteAttributePublicName(), JSC::DOMAttributeGetterSetter::create(vm, jsTestConditionallyReadWrite_settingsConditionallyReadWriteAttribute, nullptr, JSC::DOMAttributeAnnotation { JSTestConditionallyReadWrite::info(), nullptr }), attributesForStructure(static_cast<unsigned>(JSC::PropertyAttribute::CustomAccessor | JSC::PropertyAttribute::DOMAttribute)));
// Adding back attribute, but as readonly, after removing the read-write variant above.
if (!downcast<Document>(jsCast<JSDOMGlobalObject*>(globalObject())->scriptExecutionContext())->settingsValues().testFeatureEnabled)
- putDirectCustomAccessor(vm, static_cast<JSVMClientData*>(vm.clientData)->builtinNames().settingsConditionallyReadWriteAttributePromisePublicName(), CustomGetterSetter::create(vm, jsTestConditionallyReadWrite_settingsConditionallyReadWriteAttributePromise, nullptr), attributesForStructure(static_cast<unsigned>(JSC::PropertyAttribute::CustomAccessor)));
+ putDirectCustomAccessor(vm, webCoreBuiltinNames(vm).settingsConditionallyReadWriteAttributePromisePublicName(), CustomGetterSetter::create(vm, jsTestConditionallyReadWrite_settingsConditionallyReadWriteAttributePromise, nullptr), attributesForStructure(static_cast<unsigned>(JSC::PropertyAttribute::CustomAccessor)));
if (hasDisabledRuntimeProperties && structure()->isDictionary())
flattenDictionaryObject(vm);
JSC_TO_STRING_TAG_WITHOUT_TRANSITION();
@@ -247,8 +247,8 @@
static_assert(!std::is_base_of<ActiveDOMObject, TestConditionallyReadWrite>::value, "Interface is not marked as [ActiveDOMObject] even though implementation class subclasses ActiveDOMObject.");
- putDirectCustomAccessor(vm, static_cast<JSVMClientData*>(vm.clientData)->builtinNames().runtimeConditionallyReadWriteAttributeUnforgeablePrivatePrivateName(), CustomGetterSetter::create(vm, jsTestConditionallyReadWrite_runtimeConditionallyReadWriteAttributeUnforgeablePrivate, nullptr), attributesForStructure(JSC::PropertyAttribute::DontDelete | JSC::PropertyAttribute::ReadOnly));
- putDirectCustomAccessor(vm, static_cast<JSVMClientData*>(vm.clientData)->builtinNames().settingsConditionallyReadWriteAttributeUnforgeablePrivatePrivateName(), CustomGetterSetter::create(vm, jsTestConditionallyReadWrite_settingsConditionallyReadWriteAttributeUnforgeablePrivate, nullptr), attributesForStructure(JSC::PropertyAttribute::DontDelete | JSC::PropertyAttribute::ReadOnly));
+ putDirectCustomAccessor(vm, webCoreBuiltinNames(vm).runtimeConditionallyReadWriteAttributeUnforgeablePrivatePrivateName(), CustomGetterSetter::create(vm, jsTestConditionallyReadWrite_runtimeConditionallyReadWriteAttributeUnforgeablePrivate, nullptr), attributesForStructure(JSC::PropertyAttribute::DontDelete | JSC::PropertyAttribute::ReadOnly));
+ putDirectCustomAccessor(vm, webCoreBuiltinNames(vm).settingsConditionallyReadWriteAttributeUnforgeablePrivatePrivateName(), CustomGetterSetter::create(vm, jsTestConditionallyReadWrite_settingsConditionallyReadWriteAttributeUnforgeablePrivate, nullptr), attributesForStructure(JSC::PropertyAttribute::DontDelete | JSC::PropertyAttribute::ReadOnly));
}
JSObject* JSTestConditionallyReadWrite::createPrototype(VM& vm, JSDOMGlobalObject& globalObject)
Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestEnabledBySetting.cpp (292898 => 292899)
--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestEnabledBySetting.cpp 2022-04-15 01:45:58 UTC (rev 292898)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestEnabledBySetting.cpp 2022-04-15 05:44:28 UTC (rev 292899)
@@ -251,12 +251,12 @@
static_assert(!std::is_base_of<ActiveDOMObject, TestEnabledBySetting>::value, "Interface is not marked as [ActiveDOMObject] even though implementation class subclasses ActiveDOMObject.");
if (jsCast<JSDOMGlobalObject*>(globalObject())->scriptExecutionContext()->settingsValues().testSettingEnabled)
- putDirectCustomAccessor(vm, static_cast<JSVMClientData*>(vm.clientData)->builtinNames().TestSubObjEnabledBySettingPublicName(), CustomGetterSetter::create(vm, jsTestEnabledBySetting_TestSubObjEnabledBySettingConstructor, nullptr), attributesForStructure(static_cast<unsigned>(JSC::PropertyAttribute::DontEnum)));
+ putDirectCustomAccessor(vm, webCoreBuiltinNames(vm).TestSubObjEnabledBySettingPublicName(), CustomGetterSetter::create(vm, jsTestEnabledBySetting_TestSubObjEnabledBySettingConstructor, nullptr), attributesForStructure(static_cast<unsigned>(JSC::PropertyAttribute::DontEnum)));
if (jsCast<JSDOMGlobalObject*>(globalObject())->scriptExecutionContext()->settingsValues().testSettingEnabled)
- putDirectCustomAccessor(vm, static_cast<JSVMClientData*>(vm.clientData)->builtinNames().TestSubObjEnabledBySettingPrivatePrivateName(), CustomGetterSetter::create(vm, jsTestEnabledBySetting_TestSubObjEnabledBySettingPrivateConstructor, nullptr), attributesForStructure(static_cast<unsigned>(JSC::PropertyAttribute::DontEnum)));
+ putDirectCustomAccessor(vm, webCoreBuiltinNames(vm).TestSubObjEnabledBySettingPrivatePrivateName(), CustomGetterSetter::create(vm, jsTestEnabledBySetting_TestSubObjEnabledBySettingPrivateConstructor, nullptr), attributesForStructure(static_cast<unsigned>(JSC::PropertyAttribute::DontEnum)));
if (jsCast<JSDOMGlobalObject*>(globalObject())->scriptExecutionContext()->settingsValues().testSettingEnabled) {
- putDirectCustomAccessor(vm, static_cast<JSVMClientData*>(vm.clientData)->builtinNames().TestSubObjEnabledBySettingPrivatePublicPublicName(), CustomGetterSetter::create(vm, jsTestEnabledBySetting_TestSubObjEnabledBySettingPrivatePublicConstructor, nullptr), attributesForStructure(static_cast<unsigned>(JSC::PropertyAttribute::DontEnum)));
- putDirectCustomAccessor(vm, static_cast<JSVMClientData*>(vm.clientData)->builtinNames().TestSubObjEnabledBySettingPrivatePublicPrivateName(), CustomGetterSetter::create(vm, jsTestEnabledBySetting_TestSubObjEnabledBySettingPrivatePublicConstructor, nullptr), attributesForStructure(static_cast<unsigned>(JSC::PropertyAttribute::DontEnum)));
+ putDirectCustomAccessor(vm, webCoreBuiltinNames(vm).TestSubObjEnabledBySettingPrivatePublicPublicName(), CustomGetterSetter::create(vm, jsTestEnabledBySetting_TestSubObjEnabledBySettingPrivatePublicConstructor, nullptr), attributesForStructure(static_cast<unsigned>(JSC::PropertyAttribute::DontEnum)));
+ putDirectCustomAccessor(vm, webCoreBuiltinNames(vm).TestSubObjEnabledBySettingPrivatePublicPrivateName(), CustomGetterSetter::create(vm, jsTestEnabledBySetting_TestSubObjEnabledBySettingPrivatePublicConstructor, nullptr), attributesForStructure(static_cast<unsigned>(JSC::PropertyAttribute::DontEnum)));
}
}
Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestEnabledForContext.cpp (292898 => 292899)
--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestEnabledForContext.cpp 2022-04-15 01:45:58 UTC (rev 292898)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestEnabledForContext.cpp 2022-04-15 05:44:28 UTC (rev 292899)
@@ -134,7 +134,7 @@
static_assert(!std::is_base_of<ActiveDOMObject, TestEnabledForContext>::value, "Interface is not marked as [ActiveDOMObject] even though implementation class subclasses ActiveDOMObject.");
if ((jsCast<JSDOMGlobalObject*>(globalObject())->scriptExecutionContext()->settingsValues().testSettingEnabled && TestSubObjEnabledForContext::enabledForContext(*jsCast<JSDOMGlobalObject*>(globalObject())->scriptExecutionContext())))
- putDirectCustomAccessor(vm, static_cast<JSVMClientData*>(vm.clientData)->builtinNames().TestSubObjEnabledForContextPublicName(), CustomGetterSetter::create(vm, jsTestEnabledForContext_TestSubObjEnabledForContextConstructor, nullptr), attributesForStructure(static_cast<unsigned>(JSC::PropertyAttribute::DontEnum)));
+ putDirectCustomAccessor(vm, webCoreBuiltinNames(vm).TestSubObjEnabledForContextPublicName(), CustomGetterSetter::create(vm, jsTestEnabledForContext_TestSubObjEnabledForContextConstructor, nullptr), attributesForStructure(static_cast<unsigned>(JSC::PropertyAttribute::DontEnum)));
}
JSObject* JSTestEnabledForContext::createPrototype(VM& vm, JSDOMGlobalObject& globalObject)
Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestGlobalObject.cpp (292898 => 292899)
--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestGlobalObject.cpp 2022-04-15 01:45:58 UTC (rev 292898)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestGlobalObject.cpp 2022-04-15 05:44:28 UTC (rev 292899)
@@ -677,43 +677,43 @@
#if ENABLE(TEST_FEATURE)
if (RuntimeEnabledFeatures::sharedFeatures().testFeatureEnabled())
- putDirectCustomAccessor(vm, static_cast<JSVMClientData*>(vm.clientData)->builtinNames().enabledAtRuntimeAttributePublicName(), CustomGetterSetter::create(vm, jsTestGlobalObject_enabledAtRuntimeAttribute, setJSTestGlobalObject_enabledAtRuntimeAttribute), attributesForStructure(static_cast<unsigned>(JSC::PropertyAttribute::CustomAccessor)));
+ putDirectCustomAccessor(vm, webCoreBuiltinNames(vm).enabledAtRuntimeAttributePublicName(), CustomGetterSetter::create(vm, jsTestGlobalObject_enabledAtRuntimeAttribute, setJSTestGlobalObject_enabledAtRuntimeAttribute), attributesForStructure(static_cast<unsigned>(JSC::PropertyAttribute::CustomAccessor)));
#endif
if (jsCast<JSDOMGlobalObject*>(globalObject())->scriptExecutionContext()->isSecureContext())
- putDirectCustomAccessor(vm, static_cast<JSVMClientData*>(vm.clientData)->builtinNames().TestInterfaceNamePublicName(), CustomGetterSetter::create(vm, jsTestGlobalObject_TestInterfaceNameConstructor, nullptr), attributesForStructure(static_cast<unsigned>(JSC::PropertyAttribute::DontEnum)));
- putDirectCustomAccessor(vm, static_cast<JSVMClientData*>(vm.clientData)->builtinNames().publicAndPrivateAttributePrivateName(), CustomGetterSetter::create(vm, jsTestGlobalObject_publicAndPrivateAttribute, nullptr), attributesForStructure(JSC::PropertyAttribute::DontDelete | JSC::PropertyAttribute::ReadOnly));
+ putDirectCustomAccessor(vm, webCoreBuiltinNames(vm).TestInterfaceNamePublicName(), CustomGetterSetter::create(vm, jsTestGlobalObject_TestInterfaceNameConstructor, nullptr), attributesForStructure(static_cast<unsigned>(JSC::PropertyAttribute::DontEnum)));
+ putDirectCustomAccessor(vm, webCoreBuiltinNames(vm).publicAndPrivateAttributePrivateName(), CustomGetterSetter::create(vm, jsTestGlobalObject_publicAndPrivateAttribute, nullptr), attributesForStructure(JSC::PropertyAttribute::DontDelete | JSC::PropertyAttribute::ReadOnly));
#if ENABLE(TEST_FEATURE)
- putDirectCustomAccessor(vm, static_cast<JSVMClientData*>(vm.clientData)->builtinNames().publicAndPrivateConditionalAttributePrivateName(), CustomGetterSetter::create(vm, jsTestGlobalObject_publicAndPrivateConditionalAttribute, nullptr), attributesForStructure(JSC::PropertyAttribute::DontDelete | JSC::PropertyAttribute::ReadOnly));
+ putDirectCustomAccessor(vm, webCoreBuiltinNames(vm).publicAndPrivateConditionalAttributePrivateName(), CustomGetterSetter::create(vm, jsTestGlobalObject_publicAndPrivateConditionalAttribute, nullptr), attributesForStructure(JSC::PropertyAttribute::DontDelete | JSC::PropertyAttribute::ReadOnly));
#endif
#if ENABLE(TEST_FEATURE)
if (RuntimeEnabledFeatures::sharedFeatures().testFeatureEnabled())
- putDirectNativeFunction(vm, this, static_cast<JSVMClientData*>(vm.clientData)->builtinNames().enabledAtRuntimeOperationPublicName(), 1, jsTestGlobalObjectInstanceFunction_enabledAtRuntimeOperation, NoIntrinsic, attributesForStructure(static_cast<unsigned>(JSC::PropertyAttribute::Function)));
+ putDirectNativeFunction(vm, this, webCoreBuiltinNames(vm).enabledAtRuntimeOperationPublicName(), 1, jsTestGlobalObjectInstanceFunction_enabledAtRuntimeOperation, NoIntrinsic, attributesForStructure(static_cast<unsigned>(JSC::PropertyAttribute::Function)));
#endif
#if ENABLE(TEST_FEATURE)
if (RuntimeEnabledFeatures::sharedFeatures().testFeatureEnabled())
- putDirectNativeFunction(vm, this, static_cast<JSVMClientData*>(vm.clientData)->builtinNames().enabledAtRuntimeOperationStaticPublicName(), 1, jsTestGlobalObjectConstructorFunction_enabledAtRuntimeOperationStatic, NoIntrinsic, attributesForStructure(static_cast<unsigned>(JSC::PropertyAttribute::Function)));
+ putDirectNativeFunction(vm, this, webCoreBuiltinNames(vm).enabledAtRuntimeOperationStaticPublicName(), 1, jsTestGlobalObjectConstructorFunction_enabledAtRuntimeOperationStatic, NoIntrinsic, attributesForStructure(static_cast<unsigned>(JSC::PropertyAttribute::Function)));
#endif
if (worldForDOMObject(*this).specificWorld())
- putDirectNativeFunction(vm, this, static_cast<JSVMClientData*>(vm.clientData)->builtinNames().enabledInSpecificWorldPublicName(), 1, jsTestGlobalObjectInstanceFunction_enabledInSpecificWorld, NoIntrinsic, attributesForStructure(static_cast<unsigned>(JSC::PropertyAttribute::Function)));
+ putDirectNativeFunction(vm, this, webCoreBuiltinNames(vm).enabledInSpecificWorldPublicName(), 1, jsTestGlobalObjectInstanceFunction_enabledInSpecificWorld, NoIntrinsic, attributesForStructure(static_cast<unsigned>(JSC::PropertyAttribute::Function)));
if ((worldForDOMObject(*this).specificWorld() && RuntimeEnabledFeatures::sharedFeatures().testFeatureEnabled()))
- putDirectNativeFunction(vm, this, static_cast<JSVMClientData*>(vm.clientData)->builtinNames().enabledInSpecificWorldWhenRuntimeFeatureEnabledPublicName(), 1, jsTestGlobalObjectInstanceFunction_enabledInSpecificWorldWhenRuntimeFeatureEnabled, NoIntrinsic, attributesForStructure(static_cast<unsigned>(JSC::PropertyAttribute::Function)));
+ putDirectNativeFunction(vm, this, webCoreBuiltinNames(vm).enabledInSpecificWorldWhenRuntimeFeatureEnabledPublicName(), 1, jsTestGlobalObjectInstanceFunction_enabledInSpecificWorldWhenRuntimeFeatureEnabled, NoIntrinsic, attributesForStructure(static_cast<unsigned>(JSC::PropertyAttribute::Function)));
if ((worldForDOMObject(*this).specificWorld() && RuntimeEnabledFeatures::sharedFeatures().testFeatureEnabled() && RuntimeEnabledFeatures::sharedFeatures().testFeature1Enabled()))
- putDirectNativeFunction(vm, this, static_cast<JSVMClientData*>(vm.clientData)->builtinNames().enabledInSpecificWorldWhenRuntimeFeaturesEnabledPublicName(), 1, jsTestGlobalObjectInstanceFunction_enabledInSpecificWorldWhenRuntimeFeaturesEnabled, NoIntrinsic, attributesForStructure(static_cast<unsigned>(JSC::PropertyAttribute::Function)));
+ putDirectNativeFunction(vm, this, webCoreBuiltinNames(vm).enabledInSpecificWorldWhenRuntimeFeaturesEnabledPublicName(), 1, jsTestGlobalObjectInstanceFunction_enabledInSpecificWorldWhenRuntimeFeaturesEnabled, NoIntrinsic, attributesForStructure(static_cast<unsigned>(JSC::PropertyAttribute::Function)));
#if ENABLE(TEST_FEATURE)
if (RuntimeEnabledFeatures::sharedFeatures().testFeatureEnabled())
- putDirectNativeFunction(vm, this, static_cast<JSVMClientData*>(vm.clientData)->builtinNames().testPrivateFunctionPrivateName(), 0, jsTestGlobalObjectInstanceFunction_testPrivateFunction, NoIntrinsic, attributesForStructure(static_cast<unsigned>(JSC::PropertyAttribute::Function)));
+ putDirectNativeFunction(vm, this, webCoreBuiltinNames(vm).testPrivateFunctionPrivateName(), 0, jsTestGlobalObjectInstanceFunction_testPrivateFunction, NoIntrinsic, attributesForStructure(static_cast<unsigned>(JSC::PropertyAttribute::Function)));
#endif
#if ENABLE(TEST_FEATURE)
if (RuntimeEnabledFeatures::sharedFeatures().testFeatureEnabled())
- putDirectBuiltinFunction(vm, this, static_cast<JSVMClientData*>(vm.clientData)->builtinNames().testJSBuiltinFunctionPublicName(), testGlobalObjectTestJSBuiltinFunctionCodeGenerator(vm), attributesForStructure(static_cast<unsigned>(JSC::PropertyAttribute::Builtin)));
+ putDirectBuiltinFunction(vm, this, webCoreBuiltinNames(vm).testJSBuiltinFunctionPublicName(), testGlobalObjectTestJSBuiltinFunctionCodeGenerator(vm), attributesForStructure(static_cast<unsigned>(JSC::PropertyAttribute::Builtin)));
#endif
if (jsCast<JSDOMGlobalObject*>(globalObject())->scriptExecutionContext()->isSecureContext())
- putDirectNativeFunction(vm, this, static_cast<JSVMClientData*>(vm.clientData)->builtinNames().calculateSecretResultPublicName(), 0, jsTestGlobalObjectInstanceFunction_calculateSecretResult, NoIntrinsic, attributesForStructure(static_cast<unsigned>(JSC::PropertyAttribute::Function)));
+ putDirectNativeFunction(vm, this, webCoreBuiltinNames(vm).calculateSecretResultPublicName(), 0, jsTestGlobalObjectInstanceFunction_calculateSecretResult, NoIntrinsic, attributesForStructure(static_cast<unsigned>(JSC::PropertyAttribute::Function)));
if (jsCast<JSDOMGlobalObject*>(globalObject())->scriptExecutionContext()->isSecureContext())
- putDirectNativeFunction(vm, this, static_cast<JSVMClientData*>(vm.clientData)->builtinNames().getSecretBooleanPublicName(), 0, jsTestGlobalObjectInstanceFunction_getSecretBoolean, NoIntrinsic, attributesForStructure(static_cast<unsigned>(JSC::PropertyAttribute::Function)));
+ putDirectNativeFunction(vm, this, webCoreBuiltinNames(vm).getSecretBooleanPublicName(), 0, jsTestGlobalObjectInstanceFunction_getSecretBoolean, NoIntrinsic, attributesForStructure(static_cast<unsigned>(JSC::PropertyAttribute::Function)));
#if ENABLE(TEST_FEATURE)
if ((jsCast<JSDOMGlobalObject*>(globalObject())->scriptExecutionContext()->isSecureContext() && RuntimeEnabledFeatures::sharedFeatures().testFeatureEnabled()))
- putDirectNativeFunction(vm, this, static_cast<JSVMClientData*>(vm.clientData)->builtinNames().testFeatureGetSecretBooleanPublicName(), 0, jsTestGlobalObjectInstanceFunction_testFeatureGetSecretBoolean, NoIntrinsic, attributesForStructure(static_cast<unsigned>(JSC::PropertyAttribute::Function)));
+ putDirectNativeFunction(vm, this, webCoreBuiltinNames(vm).testFeatureGetSecretBooleanPublicName(), 0, jsTestGlobalObjectInstanceFunction_testFeatureGetSecretBoolean, NoIntrinsic, attributesForStructure(static_cast<unsigned>(JSC::PropertyAttribute::Function)));
#endif
}
Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp (292898 => 292899)
--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2022-04-15 01:45:58 UTC (rev 292898)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2022-04-15 05:44:28 UTC (rev 292899)
@@ -2528,8 +2528,8 @@
}
if (hasDisabledRuntimeProperties && structure()->isDictionary())
flattenDictionaryObject(vm);
- putDirect(vm, static_cast<JSVMClientData*>(vm.clientData)->builtinNames().privateMethodPrivateName(), JSFunction::create(vm, globalObject(), 0, String(), jsTestObjPrototypeFunction_privateMethod), JSC::PropertyAttribute::ReadOnly | JSC::PropertyAttribute::DontEnum);
- putDirect(vm, static_cast<JSVMClientData*>(vm.clientData)->builtinNames().publicAndPrivateMethodPrivateName(), JSFunction::create(vm, globalObject(), 0, String(), jsTestObjPrototypeFunction_publicAndPrivateMethod), JSC::PropertyAttribute::ReadOnly | JSC::PropertyAttribute::DontEnum);
+ putDirect(vm, webCoreBuiltinNames(vm).privateMethodPrivateName(), JSFunction::create(vm, globalObject(), 0, String(), jsTestObjPrototypeFunction_privateMethod), JSC::PropertyAttribute::ReadOnly | JSC::PropertyAttribute::DontEnum);
+ putDirect(vm, webCoreBuiltinNames(vm).publicAndPrivateMethodPrivateName(), JSFunction::create(vm, globalObject(), 0, String(), jsTestObjPrototypeFunction_publicAndPrivateMethod), JSC::PropertyAttribute::ReadOnly | JSC::PropertyAttribute::DontEnum);
putDirect(vm, vm.propertyNames->iteratorSymbol, globalObject()->arrayPrototype()->getDirect(vm, vm.propertyNames->builtinNames().valuesPrivateName()), static_cast<unsigned>(JSC::PropertyAttribute::DontEnum));
addValueIterableMethods(*globalObject(), *this);
JSObject& unscopables = *constructEmptyObject(globalObject()->vm(), globalObject()->nullPrototypeObjectStructure());
Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (292898 => 292899)
--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2022-04-15 01:45:58 UTC (rev 292898)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2022-04-15 05:44:28 UTC (rev 292899)
@@ -118,6 +118,7 @@
#include "VideoTrack.h"
#include "VideoTrackList.h"
#include "VideoTrackPrivate.h"
+#include "WebCoreJSClientData.h"
#include <_javascript_Core/ScriptObject.h>
#include <_javascript_Core/Uint8Array.h>
#include <limits>
@@ -4608,7 +4609,7 @@
if (!controlsHostJSWrapperObject)
return JSC::jsNull();
- JSC::Identifier controllerID = JSC::Identifier::fromString(vm, "controller"_s);
+ JSC::Identifier controllerID = webCoreBuiltinNames(vm).controllerPublicName();
JSC::JSValue controllerJSWrapper = controlsHostJSWrapperObject->get(&lexicalGlobalObject, controllerID);
RETURN_IF_EXCEPTION(scope, JSC::jsNull());
@@ -7758,7 +7759,7 @@
if (!mediaControlsHostJSWrapperObject)
return false;
- auto controller = JSC::Identifier::fromString(vm, "controller"_s);
+ auto controller = webCoreBuiltinNames(vm).controllerPublicName();
ASSERT(!controllerObject->hasProperty(&lexicalGlobalObject, controller));
Modified: trunk/Source/WebCore/testing/Internals.cpp (292898 => 292899)
--- trunk/Source/WebCore/testing/Internals.cpp 2022-04-15 01:45:58 UTC (rev 292898)
+++ trunk/Source/WebCore/testing/Internals.cpp 2022-04-15 05:44:28 UTC (rev 292899)
@@ -5067,9 +5067,8 @@
JSValue Internals::cloneArrayBuffer(JSC::JSGlobalObject& lexicalGlobalObject, JSValue buffer, JSValue srcByteOffset, JSValue srcLength)
{
- JSC::VM& vm = lexicalGlobalObject.vm();
- JSVMClientData* clientData = static_cast<JSVMClientData*>(vm.clientData);
- const Identifier& privateName = clientData->builtinNames().cloneArrayBufferPrivateName();
+ auto& vm = lexicalGlobalObject.vm();
+ const Identifier& privateName = webCoreBuiltinNames(vm).cloneArrayBufferPrivateName();
JSValue value;
PropertySlot propertySlot(value, PropertySlot::InternalMethodType::Get);
lexicalGlobalObject.methodTable(vm)->getOwnPropertySlot(&lexicalGlobalObject, &lexicalGlobalObject, privateName, propertySlot);
Modified: trunk/Source/WebCore/workers/WorkerOrWorkletScriptController.cpp (292898 => 292899)
--- trunk/Source/WebCore/workers/WorkerOrWorkletScriptController.cpp 2022-04-15 01:45:58 UTC (rev 292898)
+++ trunk/Source/WebCore/workers/WorkerOrWorkletScriptController.cpp 2022-04-15 05:44:28 UTC (rev 292899)
@@ -305,7 +305,7 @@
auto scope = DECLARE_CATCH_SCOPE(vm);
if (errorValue.isObject()) {
auto* object = JSC::asObject(errorValue);
- if (JSValue failureKindValue = object->getDirect(vm, static_cast<JSVMClientData&>(*vm.clientData).builtinNames().failureKindPrivateName())) {
+ if (JSValue failureKindValue = object->getDirect(vm, webCoreBuiltinNames(vm).failureKindPrivateName())) {
// This is host propagated error in the module loader pipeline.
switch (static_cast<ModuleFetchFailureKind>(failureKindValue.asInt32())) {
case ModuleFetchFailureKind::WasPropagatedError:
@@ -480,7 +480,7 @@
JSValue errorValue = callFrame->argument(0);
if (errorValue.isObject()) {
auto* object = JSC::asObject(errorValue);
- if (JSValue failureKindValue = object->getDirect(vm, static_cast<JSVMClientData&>(*vm.clientData).builtinNames().failureKindPrivateName())) {
+ if (JSValue failureKindValue = object->getDirect(vm, webCoreBuiltinNames(vm).failureKindPrivateName())) {
auto catchScope = DECLARE_CATCH_SCOPE(vm);
String message = retrieveErrorMessageWithoutName(*globalObject, vm, object, catchScope);
switch (static_cast<ModuleFetchFailureKind>(failureKindValue.asInt32())) {
