Changeset 268700 in webkit

Timestamp:

Oct 19, 2020, 4:50:58 PM (6 years ago)

Author:

Chris Dumez

Message:

Replace execStateFrom*() functions with globalObject() overloads
​https://bugs.webkit.org/show_bug.cgi?id=217912

Reviewed by Darin Adler.

Introduce globalObject() overloads to replace existing execStateFrom*() functions.
This is a first step to promote code sharing. Ideally, code would not have to
differentiate workers from worklets as much as possible.

No new tests, no Web-facing behavior change.

• bindings/js/JSDOMGlobalObject.cpp:

(WebCore::JSDOMGlobalObject::scriptExecutionContext const):

• bindings/js/ScriptState.cpp:

(WebCore::execStateFromWorkerOrWorkletGlobalScope):

• bindings/js/ScriptState.h:
• bindings/js/WorkerScriptController.cpp:

(WebCore::WorkerScriptController::globalScopeWrapper):

• bindings/js/WorkerScriptController.h:
• dom/ScriptExecutionContext.cpp:

(WebCore::ScriptExecutionContext::vm):
(WebCore::ScriptExecutionContext::execState):

• inspector/agents/worker/WorkerAuditAgent.cpp:

(WebCore::WorkerAuditAgent::injectedScriptForEval):

• inspector/agents/worker/WorkerDebuggerAgent.cpp:

(WebCore::WorkerDebuggerAgent::injectedScriptForEval):

• inspector/agents/worker/WorkerRuntimeAgent.cpp:

(WebCore::WorkerRuntimeAgent::injectedScriptForEval):

• workers/WorkerOrWorkletScriptController.h:
• worklets/WorkletScriptController.cpp:

(WebCore::WorkletScriptController::globalScopeWrapper):

• worklets/WorkletScriptController.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/applepay/paymentrequest/ApplePayPaymentHandler.cpp (modified) (4 diffs)
• Modules/cache/DOMCache.cpp (modified) (1 diff)
• Modules/fetch/FetchResponse.cpp (modified) (1 diff)
• Modules/indexeddb/server/IDBSerializationContext.cpp (modified) (1 diff)
• Modules/indexeddb/server/IDBSerializationContext.h (modified) (1 diff)
• Modules/indexeddb/server/MemoryObjectStore.cpp (modified) (2 diffs)
• Modules/indexeddb/server/SQLiteIDBBackingStore.cpp (modified) (1 diff)
• Modules/indexeddb/server/UniqueIDBDatabase.cpp (modified) (1 diff)
• Modules/paymentrequest/PaymentRequest.cpp (modified) (5 diffs)
• Modules/webxr/WebXRSystem.cpp (modified) (1 diff)
• bindings/js/JSCustomElementInterface.cpp (modified) (1 diff)
• bindings/js/JSDOMGlobalObject.cpp (modified) (1 diff)
• bindings/js/ScriptState.cpp (modified) (3 diffs)
• bindings/js/ScriptState.h (modified) (2 diffs)
• bindings/js/WorkerScriptController.cpp (modified) (1 diff)
• bindings/js/WorkerScriptController.h (modified) (1 diff)
• dom/ScriptExecutionContext.cpp (modified) (2 diffs)
• dom/ScriptExecutionContext.h (modified) (1 diff)
• fileapi/Blob.cpp (modified) (1 diff)
• html/parser/HTMLDocumentParser.cpp (modified) (1 diff)
• inspector/InspectorFrontendHost.cpp (modified) (2 diffs)
• inspector/InspectorInstrumentation.cpp (modified) (1 diff)
• inspector/agents/InspectorAnimationAgent.cpp (modified) (1 diff)
• inspector/agents/InspectorCanvasAgent.cpp (modified) (1 diff)
• inspector/agents/InspectorDOMAgent.cpp (modified) (3 diffs)
• inspector/agents/InspectorDOMDebuggerAgent.cpp (modified) (2 diffs)
• inspector/agents/InspectorIndexedDBAgent.cpp (modified) (3 diffs)
• inspector/agents/WebDebuggerAgent.cpp (modified) (2 diffs)
• inspector/agents/page/PageDebuggerAgent.cpp (modified) (1 diff)
• inspector/agents/worker/WorkerAuditAgent.cpp (modified) (1 diff)
• inspector/agents/worker/WorkerDebuggerAgent.cpp (modified) (1 diff)
• inspector/agents/worker/WorkerRuntimeAgent.cpp (modified) (1 diff)
• testing/WebXRTest.cpp (modified) (1 diff)
• testing/js/WebCoreTestSupport.cpp (modified) (1 diff)
• workers/WorkerOrWorkletScriptController.h (modified) (1 diff)
• worklets/WorkletScriptController.cpp (modified) (1 diff)
• worklets/WorkletScriptController.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-10-19  Chris Dumez  <cdumez@apple.com>
+
+        Replace execStateFrom*() functions with globalObject() overloads
+        https://bugs.webkit.org/show_bug.cgi?id=217912
+
+        Reviewed by Darin Adler.
+
+        Introduce globalObject() overloads to replace existing execStateFrom*() functions.
+        This is a first step to promote code sharing. Ideally, code would not have to
+        differentiate workers from worklets as much as possible.
+
+        No new tests, no Web-facing behavior change.
+
+        * bindings/js/JSDOMGlobalObject.cpp:
+        (WebCore::JSDOMGlobalObject::scriptExecutionContext const):
+        * bindings/js/ScriptState.cpp:
+        (WebCore::execStateFromWorkerOrWorkletGlobalScope):
+        * bindings/js/ScriptState.h:
+        * bindings/js/WorkerScriptController.cpp:
+        (WebCore::WorkerScriptController::globalScopeWrapper):
+        * bindings/js/WorkerScriptController.h:
+        * dom/ScriptExecutionContext.cpp:
+        (WebCore::ScriptExecutionContext::vm):
+        (WebCore::ScriptExecutionContext::execState):
+        * inspector/agents/worker/WorkerAuditAgent.cpp:
+        (WebCore::WorkerAuditAgent::injectedScriptForEval):
+        * inspector/agents/worker/WorkerDebuggerAgent.cpp:
+        (WebCore::WorkerDebuggerAgent::injectedScriptForEval):
+        * inspector/agents/worker/WorkerRuntimeAgent.cpp:
+        (WebCore::WorkerRuntimeAgent::injectedScriptForEval):
+        * workers/WorkerOrWorkletScriptController.h:
+        * worklets/WorkletScriptController.cpp:
+        (WebCore::WorkletScriptController::globalScopeWrapper):
+        * worklets/WorkletScriptController.h:
+
 2020-10-19  Timothy Horton  <timothy_horton@apple.com>
 

trunk/Source/WebCore/Modules/applepay/paymentrequest/ApplePayPaymentHandler.cpp

@@ -68 +68 @@
 
     auto throwScope = DECLARE_THROW_SCOPE(context.vm());
-    auto applePayRequest = convertDictionary<ApplePayRequest>(*context.execState(), data);
+    auto applePayRequest = convertDictionary<ApplePayRequest>(*context.globalObject(), data);
     if (throwScope.exception())
         return Exception { ExistingExceptionError };
@@ -306 +306 @@
             continue;
 
-        auto& lexicalGlobalObject = *document().execState();
+        auto& lexicalGlobalObject = *document().globalObject();
         auto scope = DECLARE_THROW_SCOPE(lexicalGlobalObject.vm());
         JSC::JSValue data;
@@ -404 +404 @@
     auto& context = *scriptExecutionContext();
     auto throwScope = DECLARE_THROW_SCOPE(context.vm());
-    auto applePayErrors = convert<IDLSequence<IDLInterface<ApplePayError>>>(*context.execState(), paymentMethodErrors);
+    auto applePayErrors = convert<IDLSequence<IDLInterface<ApplePayError>>>(*context.globalObject(), paymentMethodErrors);
     if (throwScope.exception())
         return Exception { ExistingExceptionError };
@@ -443 +443 @@
 
     String errorMessage;
-    auto merchantSession = PaymentMerchantSession::fromJS(*document().execState(), asObject(merchantSessionValue), errorMessage);
+    auto merchantSession = PaymentMerchantSession::fromJS(*document().globalObject(), asObject(merchantSessionValue), errorMessage);
     if (!merchantSession)
         return Exception { TypeError, WTFMove(errorMessage) };

trunk/Source/WebCore/Modules/cache/DOMCache.cpp

@@ -367 +367 @@
     // FIXME: for efficiency, we should load blobs directly instead of going through the readableStream path.
     if (response->isBlobBody()) {
-        auto streamOrException = response->readableStream(*scriptExecutionContext()->execState());
+        auto streamOrException = response->readableStream(*scriptExecutionContext()->globalObject());
         if (UNLIKELY(streamOrException.hasException())) {
             promise.reject(streamOrException.releaseException());

trunk/Source/WebCore/Modules/fetch/FetchResponse.cpp

@@ -179 +179 @@
     // If loading, let's create a stream so that data is teed on both clones.
     if (isLoading() && !m_readableStreamSource) {
-        auto voidOrException = createReadableStream(*context.execState());
+        auto voidOrException = createReadableStream(*context.globalObject());
         if (UNLIKELY(voidOrException.hasException()))
             return voidOrException.releaseException();

trunk/Source/WebCore/Modules/indexeddb/server/IDBSerializationContext.cpp

@@ -92 +92 @@
 }
 
-JSC::JSGlobalObject& IDBSerializationContext::execState()
+JSC::JSGlobalObject& IDBSerializationContext::globalObject()
 {
     initializeVM();

trunk/Source/WebCore/Modules/indexeddb/server/IDBSerializationContext.h

@@ -49 +49 @@
 
     JSC::VM& vm();
-    JSC::JSGlobalObject& execState();
+    JSC::JSGlobalObject& globalObject();
 
 private:

trunk/Source/WebCore/Modules/indexeddb/server/MemoryObjectStore.cpp

@@ -253 +253 @@
 IDBError MemoryObjectStore::addRecord(MemoryBackingStoreTransaction& transaction, const IDBKeyData& keyData, const IDBValue& value)
 {
-    auto indexKeys = generateIndexKeyMapForValue(m_serializationContext->execState(), m_info, keyData, value);
+    auto indexKeys = generateIndexKeyMapForValue(m_serializationContext->globalObject(), m_info, keyData, value);
     return addRecord(transaction, keyData, indexKeys, value);
 }
@@ -343 +343 @@
 
     for (const auto& iterator : *m_keyValueStore) {
-        auto jsValue = deserializeIDBValueToJSValue(m_serializationContext->execState(), iterator.value);
+        auto jsValue = deserializeIDBValueToJSValue(m_serializationContext->globalObject(), iterator.value);
         if (jsValue.isUndefinedOrNull())
             return IDBError { };
 
         IndexKey indexKey;
-        generateIndexKeyForValue(m_serializationContext->execState(), index.info(), jsValue, indexKey, m_info.keyPath(), iterator.key);
+        generateIndexKeyForValue(m_serializationContext->globalObject(), index.info(), jsValue, indexKey, m_info.keyPath(), iterator.key);
 
         if (indexKey.isNull())

trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp

@@ -2087 +2087 @@
     JSLockHolder locker(m_serializationContext->vm());
 
-    auto jsValue = deserializeIDBValueToJSValue(m_serializationContext->execState(), value);
+    auto jsValue = deserializeIDBValueToJSValue(m_serializationContext->globalObject(), value);
     if (jsValue.isUndefinedOrNull())
         return IDBError { };
 
     IndexKey indexKey;
-    generateIndexKeyForValue(m_serializationContext->execState(), info, jsValue, indexKey, objectStoreInfo.keyPath(), key);
+    generateIndexKeyForValue(m_serializationContext->globalObject(), info, jsValue, indexKey, objectStoreInfo.keyPath(), key);
 
     if (indexKey.isNull())

trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp

@@ -759 +759 @@
 
     // Generate index keys up front for more accurate quota check.
-    auto indexKeys = generateIndexKeyMapForValue(m_backingStore->serializationContext().execState(), *objectStoreInfo, usedKey, value);
+    auto indexKeys = generateIndexKeyMapForValue(m_backingStore->serializationContext().globalObject(), *objectStoreInfo, usedKey, value);
 
     if (overwriteMode == IndexedDB::ObjectStoreOverwriteMode::NoOverwrite) {

trunk/Source/WebCore/Modules/paymentrequest/PaymentRequest.cpp

@@ -309 +309 @@
 {
     auto scope = DECLARE_THROW_SCOPE(context.vm());
-    JSC::JSValue data = JSONParse(context.execState(), string);
+    JSC::JSValue data = JSONParse(context.globalObject(), string);
     if (scope.exception())
         return Exception { ExistingExceptionError };
@@ -338 +338 @@
         String serializedData;
         if (paymentMethod.data) {
-            auto scope = DECLARE_THROW_SCOPE(document.execState()->vm());
-            serializedData = JSONStringify(document.execState(), paymentMethod.data.get(), 0);
+            auto scope = DECLARE_THROW_SCOPE(document.globalObject()->vm());
+            serializedData = JSONStringify(document.globalObject(), paymentMethod.data.get(), 0);
             if (scope.exception())
                 return Exception { ExistingExceptionError };
@@ -358 +358 @@
         return totalResult.releaseException();
 
-    auto detailsResult = checkAndCanonicalizeDetails(*document.execState(), details, options.requestShipping, ShouldValidatePaymentMethodIdentifier::No);
+    auto detailsResult = checkAndCanonicalizeDetails(*document.globalObject(), details, options.requestShipping, ShouldValidatePaymentMethodIdentifier::No);
     if (detailsResult.hasException())
         return detailsResult.releaseException();
@@ -648 +648 @@
     auto& context = *m_detailsPromise->scriptExecutionContext();
     auto throwScope = DECLARE_THROW_SCOPE(context.vm());
-    auto detailsUpdate = convertDictionary<PaymentDetailsUpdate>(*context.execState(), m_detailsPromise->result());
+    auto detailsUpdate = convertDictionary<PaymentDetailsUpdate>(*context.globalObject(), m_detailsPromise->result());
     if (throwScope.exception()) {
         abortWithException(Exception { ExistingExceptionError });
@@ -660 +660 @@
     }
 
-    auto detailsResult = checkAndCanonicalizeDetails(*context.execState(), detailsUpdate, m_options.requestShipping, ShouldValidatePaymentMethodIdentifier::Yes);
+    auto detailsResult = checkAndCanonicalizeDetails(*context.globalObject(), detailsUpdate, m_options.requestShipping, ShouldValidatePaymentMethodIdentifier::Yes);
     if (detailsResult.hasException()) {
         abortWithException(detailsResult.releaseException());

trunk/Source/WebCore/Modules/webxr/WebXRSystem.cpp

@@ -389 +389 @@
             return;
 
-        auto* globalObject = protectedDocument->execState();
+        auto* globalObject = protectedDocument->globalObject();
         if (!globalObject)
             return;

trunk/Source/WebCore/bindings/js/JSCustomElementInterface.cpp

@@ -100 +100 @@
 
     ASSERT(&document == scriptExecutionContext());
-    auto& lexicalGlobalObject = *document.execState();
+    auto& lexicalGlobalObject = *document.globalObject();
     auto element = constructCustomElementSynchronously(document, vm, lexicalGlobalObject, m_constructor.get(), localName);
     EXCEPTION_ASSERT(!!scope.exception() == !element);

trunk/Source/WebCore/bindings/js/JSDOMGlobalObject.cpp

@@ -225 +225 @@
     if (inherits<JSWorkerGlobalScopeBase>(vm()))
         return jsCast<const JSWorkerGlobalScopeBase*>(this)->scriptExecutionContext();
-#if ENABLE(CSS_PAINTING_API)
     if (inherits<JSWorkletGlobalScopeBase>(vm()))
         return jsCast<const JSWorkletGlobalScopeBase*>(this)->scriptExecutionContext();
-#endif
 #if ENABLE(INDEXED_DATABASE)
     if (inherits<JSIDBSerializationGlobalObject>(vm()))

trunk/Source/WebCore/bindings/js/ScriptState.cpp

@@ -40 +40 @@
 #include "Page.h"
 #include "ScriptController.h"
-#include "WorkerGlobalScope.h"
+#include "WorkerOrWorkletGlobalScope.h"
 #include "WorkerScriptController.h"
 #include "WorkletGlobalScope.h"
@@ -82 +82 @@
 }
 
-JSC::JSGlobalObject* execStateFromNode(DOMWrapperWorld& world, Node* node)
+JSC::JSGlobalObject* globalObject(DOMWrapperWorld& world, Node* node)
 {
     if (!node)
@@ -94 +94 @@
 }
 
-JSC::JSGlobalObject* execStateFromPage(DOMWrapperWorld& world, Page* page)
+JSC::JSGlobalObject* globalObject(DOMWrapperWorld& world, Page* page)
 {
     return page ? page->mainFrame().script().globalObject(world) : nullptr;
 }
 
-JSC::JSGlobalObject* execStateFromWorkerGlobalScope(WorkerGlobalScope& workerGlobalScope)
+JSC::JSGlobalObject* globalObject(WorkerOrWorkletGlobalScope& workerOrWorkletGlobalScope)
 {
-    return workerGlobalScope.script()->workerGlobalScopeWrapper();
+    if (auto* scriptController = workerOrWorkletGlobalScope.script())
+        return scriptController->globalScopeWrapper();
+    return nullptr;
 }
 
-#if ENABLE(CSS_PAINTING_API)
-JSC::JSGlobalObject* execStateFromWorkletGlobalScope(WorkletGlobalScope& workletGlobalScope)
-{
-    if (!workletGlobalScope.script())
-        return nullptr;
-    return workletGlobalScope.script()->workletGlobalScopeWrapper();
 }
-#endif
-
-}

trunk/Source/WebCore/bindings/js/ScriptState.h

@@ -45 +45 @@
 class Page;
 class ScriptExecutionContext;
-class WorkerGlobalScope;
-#if ENABLE(CSS_PAINTING_API)
-class WorkletGlobalScope;
-#endif
+class WorkerOrWorkletGlobalScope;
 
 DOMWindow* domWindowFromExecState(JSC::JSGlobalObject*);
@@ -56 +53 @@
 JSC::JSGlobalObject* mainWorldExecState(Frame*);
 
-JSC::JSGlobalObject* execStateFromNode(DOMWrapperWorld&, Node*);
-WEBCORE_EXPORT JSC::JSGlobalObject* execStateFromPage(DOMWrapperWorld&, Page*);
-JSC::JSGlobalObject* execStateFromWorkerGlobalScope(WorkerGlobalScope&);
-#if ENABLE(CSS_PAINTING_API)
-JSC::JSGlobalObject* execStateFromWorkletGlobalScope(WorkletGlobalScope&);
-#endif
+JSC::JSGlobalObject* globalObject(DOMWrapperWorld&, Node*);
+WEBCORE_EXPORT JSC::JSGlobalObject* globalObject(DOMWrapperWorld&, Page*);
+JSC::JSGlobalObject* globalObject(WorkerOrWorkletGlobalScope&);
 
 } // namespace WebCore

trunk/Source/WebCore/bindings/js/WorkerScriptController.cpp

@@ -280 +280 @@
 }
 
+JSC::JSGlobalObject* WorkerScriptController::globalScopeWrapper()
+{
+    return workerGlobalScopeWrapper();
+}
+
 } // namespace WebCore

trunk/Source/WebCore/bindings/js/WorkerScriptController.h

@@ -58 +58 @@
     }
 
+    JSC::JSGlobalObject* globalScopeWrapper() final;
+
     void evaluate(const ScriptSourceCode&, String* returnedExceptionMessage = nullptr);
     void evaluate(const ScriptSourceCode&, NakedPtr<JSC::Exception>& returnedException, String* returnedExceptionMessage = nullptr);

trunk/Source/WebCore/dom/ScriptExecutionContext.cpp

@@ -484 +484 @@
     if (is<WorkerGlobalScope>(*this))
         return downcast<WorkerGlobalScope>(*this).script()->vm();
-#if ENABLE(CSS_PAINTING_API)
     if (is<WorkletGlobalScope>(*this))
         return downcast<WorkletGlobalScope>(*this).script()->vm();
-#endif
 
     RELEASE_ASSERT_NOT_REACHED();
@@ -525 +523 @@
 }
 
-JSC::JSGlobalObject* ScriptExecutionContext::execState()
-{
-    if (is<Document>(*this)) {
-        Document& document = downcast<Document>(*this);
-        auto* frame = document.frame();
-        return frame ? frame->script().globalObject(mainThreadNormalWorld()) : nullptr;
-    }
-
-    if (is<WorkerGlobalScope>(*this))
-        return execStateFromWorkerGlobalScope(downcast<WorkerGlobalScope>(*this));
-#if ENABLE(CSS_PAINTING_API)
-    if (is<WorkletGlobalScope>(*this))
-        return execStateFromWorkletGlobalScope(downcast<WorkletGlobalScope>(*this));
-#endif
+JSC::JSGlobalObject* ScriptExecutionContext::globalObject()
+{
+    if (is<Document>(*this))
+        return WebCore::globalObject(mainThreadNormalWorld(), downcast<Document>(*this).page());
+
+    if (is<WorkerOrWorkletGlobalScope>(*this))
+        return WebCore::globalObject(downcast<WorkerOrWorkletGlobalScope>(*this));
 
     ASSERT_NOT_REACHED();

trunk/Source/WebCore/dom/ScriptExecutionContext.h

@@ -243 +243 @@
     }
 
-    WEBCORE_EXPORT JSC::JSGlobalObject* execState();
+    WEBCORE_EXPORT JSC::JSGlobalObject* globalObject();
 
     WEBCORE_EXPORT String domainForCachePartition() const;

trunk/Source/WebCore/fileapi/Blob.cpp

@@ -278 +278 @@
     };
 
-    return ReadableStream::create(*scriptExecutionContext.execState(), adoptRef(*new BlobStreamSource(scriptExecutionContext, *this)));
+    return ReadableStream::create(*scriptExecutionContext.globalObject(), adoptRef(*new BlobStreamSource(scriptExecutionContext, *this)));
 }
 

trunk/Source/WebCore/html/parser/HTMLDocumentParser.cpp

@@ -229 +229 @@
             document()->eventLoop().performMicrotaskCheckpoint();
 
-            CustomElementReactionStack reactionStack(document()->execState());
+            CustomElementReactionStack reactionStack(document()->globalObject());
             auto& elementInterface = constructionData->elementInterface.get();
             auto newElement = elementInterface.constructElementWithFallback(*document(), constructionData->name);

trunk/Source/WebCore/inspector/InspectorFrontendHost.cpp

@@ -157 +157 @@
 void InspectorFrontendHost::addSelfToGlobalObjectInWorld(DOMWrapperWorld& world)
 {
-    auto& lexicalGlobalObject = *execStateFromPage(world, m_frontendPage);
+    auto& lexicalGlobalObject = *globalObject(world, m_frontendPage);
     auto& vm = lexicalGlobalObject.vm();
     JSC::JSLockHolder lock(vm);
@@ -501 +501 @@
     ASSERT(m_frontendPage);
 
-    auto& lexicalGlobalObject = *execStateFromPage(debuggerWorld(), m_frontendPage);
+    auto& lexicalGlobalObject = *globalObject(debuggerWorld(), m_frontendPage);
     auto& vm = lexicalGlobalObject.vm();
     auto value = lexicalGlobalObject.get(&lexicalGlobalObject, JSC::Identifier::fromString(vm, "InspectorFrontendAPI"));

trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp

@@ -322 +322 @@
 {
     if (auto* webDebuggerAgent = instrumentingAgents.enabledWebDebuggerAgent())
-        webDebuggerAgent->didScheduleAsyncCall(context.execState(), InspectorDebuggerAgent::AsyncCallType::DOMTimer, timerId, singleShot);
+        webDebuggerAgent->didScheduleAsyncCall(context.globalObject(), InspectorDebuggerAgent::AsyncCallType::DOMTimer, timerId, singleShot);
 
     if (auto* timelineAgent = instrumentingAgents.trackingTimelineAgent())

trunk/Source/WebCore/inspector/agents/InspectorAnimationAgent.cpp

@@ -314 +314 @@
         return makeUnexpected(errorString);
 
-    auto* state = animation->scriptExecutionContext()->execState();
+    auto* state = animation->scriptExecutionContext()->globalObject();
     auto injectedScript = m_injectedScriptManager.injectedScriptFor(state);
     ASSERT(!injectedScript.hasNoValue());

trunk/Source/WebCore/inspector/agents/InspectorCanvasAgent.cpp

@@ -249 +249 @@
         return makeUnexpected(errorString);
 
-    auto* state = inspectorCanvas->scriptExecutionContext()->execState();
+    auto* state = inspectorCanvas->scriptExecutionContext()->globalObject();
     auto injectedScript = m_injectedScriptManager.injectedScriptFor(state);
     ASSERT(!injectedScript.hasNoValue());

trunk/Source/WebCore/inspector/agents/InspectorDOMAgent.cpp

@@ -1848 +1848 @@
 
         JSC::JSObject* handlerObject = nullptr;
-        JSC::JSGlobalObject* exec = nullptr;
+        JSC::JSGlobalObject* globalObject = nullptr;
 
         JSC::JSLockHolder lock(scriptListener.isolatedWorld().vm());
@@ -1854 +1854 @@
         if (document) {
             handlerObject = scriptListener.ensureJSFunction(*document);
-            exec = execStateFromNode(scriptListener.isolatedWorld(), document);
+            globalObject = WebCore::globalObject(scriptListener.isolatedWorld(), document);
         }
 
-        if (handlerObject && exec) {
-            JSC::VM& vm = exec->vm();
+        if (handlerObject && globalObject) {
+            JSC::VM& vm = globalObject->vm();
             JSC::JSFunction* handlerFunction = JSC::jsDynamicCast<JSC::JSFunction*>(vm, handlerObject);
 
@@ -1865 +1865 @@
 
                 // If the handler is not actually a function, see if it implements the EventListener interface and use that.
-                auto handleEventValue = handlerObject->get(exec, JSC::Identifier::fromString(vm, "handleEvent"));
+                auto handleEventValue = handlerObject->get(globalObject, JSC::Identifier::fromString(vm, "handleEvent"));
 
                 if (UNLIKELY(scope.exception()))

trunk/Source/WebCore/inspector/agents/InspectorDOMDebuggerAgent.cpp

@@ -221 +221 @@
 void InspectorDOMDebuggerAgent::willHandleEvent(Event& event, const RegisteredEventListener& registeredEventListener)
 {
-    auto state = event.target()->scriptExecutionContext()->execState();
+    auto state = event.target()->scriptExecutionContext()->globalObject();
     auto injectedScript = m_injectedScriptManager.injectedScriptFor(state);
     if (injectedScript.hasNoValue())
@@ -262 +262 @@
 void InspectorDOMDebuggerAgent::didHandleEvent(Event& event, const RegisteredEventListener& registeredEventListener)
 {
-    auto state = event.target()->scriptExecutionContext()->execState();
+    auto state = event.target()->scriptExecutionContext()->globalObject();
     auto injectedScript = m_injectedScriptManager.injectedScriptFor(state);
     if (injectedScript.hasNoValue())

trunk/Source/WebCore/inspector/agents/InspectorIndexedDBAgent.cpp

@@ -389 +389 @@
         }
 
-        auto* lexicalGlobalObject = context.execState();
+        auto* lexicalGlobalObject = context.globalObject();
 
         auto key = m_injectedScript.wrapObject(toJS(*lexicalGlobalObject, *lexicalGlobalObject, cursor->key()), String(), true);
@@ -463 +463 @@
         TransactionActivator activator(idbTransaction.get());
         RefPtr<IDBRequest> idbRequest;
-        auto* exec = context() ? context()->execState() : nullptr;
+        auto* exec = context() ? context()->globalObject() : nullptr;
         if (!m_indexName.isEmpty()) {
             auto idbIndex = indexForObjectStore(idbObjectStore.get(), m_indexName);
@@ -706 +706 @@
         TransactionActivator activator(idbTransaction.get());
         RefPtr<IDBRequest> idbRequest;
-        if (auto* exec = context() ? context()->execState() : nullptr) {
+        if (auto* exec = context() ? context()->globalObject() : nullptr) {
             auto result = idbObjectStore->clear(*exec);
             ASSERT(!result.hasException());

trunk/Source/WebCore/inspector/agents/WebDebuggerAgent.cpp

@@ -80 +80 @@
         return;
 
-    JSC::JSGlobalObject* scriptState = target.scriptExecutionContext()->execState();
-    if (!scriptState)
+    auto* globalObject = target.scriptExecutionContext()->globalObject();
+    if (!globalObject)
         return;
 
@@ -87 +87 @@
     m_registeredEventListeners.set(registeredListener.get(), identifier);
 
-    didScheduleAsyncCall(scriptState, InspectorDebuggerAgent::AsyncCallType::EventListener, identifier, registeredListener->isOnce());
+    didScheduleAsyncCall(globalObject, InspectorDebuggerAgent::AsyncCallType::EventListener, identifier, registeredListener->isOnce());
 }
 

trunk/Source/WebCore/inspector/agents/page/PageDebuggerAgent.cpp

@@ -172 +172 @@
         return;
 
-    JSC::JSGlobalObject* scriptState = document.execState();
-    if (!scriptState)
+    auto* globalObject = document.globalObject();
+    if (!globalObject)
         return;
 
-    didScheduleAsyncCall(scriptState, InspectorDebuggerAgent::AsyncCallType::RequestAnimationFrame, callbackId, true);
+    didScheduleAsyncCall(globalObject, InspectorDebuggerAgent::AsyncCallType::RequestAnimationFrame, callbackId, true);
 }
 

trunk/Source/WebCore/inspector/agents/worker/WorkerAuditAgent.cpp

@@ -56 +56 @@
     }
 
-    JSC::JSGlobalObject* scriptState = execStateFromWorkerGlobalScope(m_workerGlobalScope);
-    return injectedScriptManager().injectedScriptFor(scriptState);
+    return injectedScriptManager().injectedScriptFor(globalObject(m_workerGlobalScope));
 }
 

trunk/Source/WebCore/inspector/agents/worker/WorkerDebuggerAgent.cpp

@@ -61 +61 @@
     }
 
-    JSC::JSGlobalObject* scriptState = execStateFromWorkerGlobalScope(m_workerGlobalScope);
-    return injectedScriptManager().injectedScriptFor(scriptState);
+    return injectedScriptManager().injectedScriptFor(globalObject(m_workerGlobalScope));
 }
 

trunk/Source/WebCore/inspector/agents/worker/WorkerRuntimeAgent.cpp

@@ -59 +59 @@
     }
 
-    JSC::JSGlobalObject* scriptState = execStateFromWorkerGlobalScope(m_workerGlobalScope);
-    return injectedScriptManager().injectedScriptFor(scriptState);
+    return injectedScriptManager().injectedScriptFor(globalObject(m_workerGlobalScope));
 }
 

trunk/Source/WebCore/testing/WebXRTest.cpp

@@ -57 +57 @@
         Vector<XRReferenceSpaceType> features;
         if (init.supportedFeatures) {
-            if (auto* globalObject = context.execState()) {
+            if (auto* globalObject = context.globalObject()) {
                 for (auto& feature : init.supportedFeatures.value()) {
                     if (auto referenceSpaceType = parseEnumeration<XRReferenceSpaceType>(*globalObject, feature))

trunk/Source/WebCore/testing/js/WebCoreTestSupport.cpp

@@ -223 +223 @@
             return;
 
-        auto& state = *globalScope.execState();
-        auto& vm = state.vm();
+        auto& globalObject = *globalScope.globalObject();
+        auto& vm = globalObject.vm();
         JSLockHolder locker(vm);
         auto* contextWrapper = script->workerGlobalScopeWrapper();
-        contextWrapper->putDirect(vm, Identifier::fromString(vm, Internals::internalsId), toJS(&state, contextWrapper, ServiceWorkerInternals::create(identifier)));
+        contextWrapper->putDirect(vm, Identifier::fromString(vm, Internals::internalsId), toJS(&globalObject, contextWrapper, ServiceWorkerInternals::create(identifier)));
     });
 #else

trunk/Source/WebCore/workers/WorkerOrWorkletScriptController.h

@@ -41 +41 @@
 
     virtual bool isTerminatingExecution() const = 0;
+
+    virtual JSC::JSGlobalObject* globalScopeWrapper() = 0;
 };
 

trunk/Source/WebCore/worklets/WorkletScriptController.cpp

@@ -268 +268 @@
 }
 
+JSC::JSGlobalObject* WorkletScriptController::globalScopeWrapper()
+{
+    return workletGlobalScopeWrapper();
+}
+
 } // namespace WebCore

trunk/Source/WebCore/worklets/WorkletScriptController.h

@@ -60 +60 @@
     }
 
+    JSC::JSGlobalObject* globalScopeWrapper() final;
+
     void forbidExecution();
     bool isExecutionForbidden() const;