Changeset 286025 in webkit

Timestamp:

Nov 18, 2021, 1:28:14 PM (5 years ago)

Author:

Chris Dumez

Message:

Port call sites to ScriptExecutionContext::identifier() and drop ScriptExecutionContext::contextIdentifier()
​https://bugs.webkit.org/show_bug.cgi?id=233323

Reviewed by Geoffrey Garen.

Port call sites to ScriptExecutionContext::identifier() and drop ScriptExecutionContext::contextIdentifier() alias.

• Modules/mediacapabilities/MediaCapabilities.cpp:

(WebCore::MediaCapabilities::decodingInfo):
(WebCore::MediaCapabilities::encodingInfo):

• Modules/mediastream/RTCDataChannel.cpp:

(WebCore::RTCDataChannel::create):
(WebCore::m_contextIdentifier):

• Modules/mediastream/RTCRtpSFrameTransform.cpp:

(WebCore::RTCRtpSFrameTransform::initializeTransformer):
(WebCore::RTCRtpSFrameTransform::createStreams):

• crypto/CryptoAlgorithm.cpp:

(WebCore::dispatchAlgorithmOperation):

• crypto/algorithms/CryptoAlgorithmECDH.cpp:

(WebCore::CryptoAlgorithmECDH::deriveBits):

• crypto/algorithms/CryptoAlgorithmSHA1.cpp:

(WebCore::CryptoAlgorithmSHA1::digest):

• crypto/algorithms/CryptoAlgorithmSHA224.cpp:

(WebCore::CryptoAlgorithmSHA224::digest):

• crypto/algorithms/CryptoAlgorithmSHA256.cpp:

(WebCore::CryptoAlgorithmSHA256::digest):

• crypto/algorithms/CryptoAlgorithmSHA384.cpp:

(WebCore::CryptoAlgorithmSHA384::digest):

• crypto/algorithms/CryptoAlgorithmSHA512.cpp:

(WebCore::CryptoAlgorithmSHA512::digest):

• crypto/mac/CryptoKeyRSAMac.cpp:

(WebCore::CryptoKeyRSA::generatePair):

• dom/BroadcastChannel.cpp:

(WebCore::BroadcastChannel::MainThreadBridge::registerChannel):

• dom/ScriptExecutionContext.cpp:

(WebCore::ScriptExecutionContext::ScriptExecutionContext):
(WebCore::ScriptExecutionContext::removeFromContextsMap):
(WebCore::ScriptExecutionContext::~ScriptExecutionContext):

• dom/ScriptExecutionContext.h:

(WebCore::ScriptExecutionContext::identifier const):
(WebCore::ScriptExecutionContext::contextIdentifier const): Deleted.

• workers/WorkerGlobalScope.cpp:

(WebCore::m_credentials):
(WebCore::WorkerGlobalScope::~WorkerGlobalScope):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/mediacapabilities/MediaCapabilities.cpp (modified) (2 diffs)
• Modules/mediastream/RTCDataChannel.cpp (modified) (2 diffs)
• Modules/mediastream/RTCRtpSFrameTransform.cpp (modified) (2 diffs)
• crypto/CryptoAlgorithm.cpp (modified) (1 diff)
• crypto/algorithms/CryptoAlgorithmECDH.cpp (modified) (1 diff)
• crypto/algorithms/CryptoAlgorithmSHA1.cpp (modified) (1 diff)
• crypto/algorithms/CryptoAlgorithmSHA224.cpp (modified) (1 diff)
• crypto/algorithms/CryptoAlgorithmSHA256.cpp (modified) (1 diff)
• crypto/algorithms/CryptoAlgorithmSHA384.cpp (modified) (1 diff)
• crypto/algorithms/CryptoAlgorithmSHA512.cpp (modified) (1 diff)
• crypto/mac/CryptoKeyRSAMac.cpp (modified) (1 diff)
• dom/BroadcastChannel.cpp (modified) (1 diff)
• dom/ScriptExecutionContext.cpp (modified) (3 diffs)
• dom/ScriptExecutionContext.h (modified) (2 diffs)
• inspector/agents/worker/ServiceWorkerAgent.cpp (modified) (1 diff)
• page/cocoa/ResourceUsageThreadCocoa.mm (modified) (1 diff)
• workers/WorkerGlobalScope.cpp (modified) (3 diffs)
• workers/WorkerGlobalScope.h (modified) (3 diffs)
• workers/WorkerOrWorkletThread.cpp (modified) (1 diff)
• workers/WorkerOrWorkletThread.h (modified) (3 diffs)
• workers/WorkerThread.cpp (modified) (2 diffs)
• workers/WorkerThread.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-11-18  Chris Dumez  <cdumez@apple.com>
+
+        Port call sites to ScriptExecutionContext::identifier() and drop ScriptExecutionContext::contextIdentifier()
+        https://bugs.webkit.org/show_bug.cgi?id=233323
+
+        Reviewed by Geoffrey Garen.
+
+        Port call sites to ScriptExecutionContext::identifier() and drop ScriptExecutionContext::contextIdentifier() alias.
+
+        * Modules/mediacapabilities/MediaCapabilities.cpp:
+        (WebCore::MediaCapabilities::decodingInfo):
+        (WebCore::MediaCapabilities::encodingInfo):
+        * Modules/mediastream/RTCDataChannel.cpp:
+        (WebCore::RTCDataChannel::create):
+        (WebCore::m_contextIdentifier):
+        * Modules/mediastream/RTCRtpSFrameTransform.cpp:
+        (WebCore::RTCRtpSFrameTransform::initializeTransformer):
+        (WebCore::RTCRtpSFrameTransform::createStreams):
+        * crypto/CryptoAlgorithm.cpp:
+        (WebCore::dispatchAlgorithmOperation):
+        * crypto/algorithms/CryptoAlgorithmECDH.cpp:
+        (WebCore::CryptoAlgorithmECDH::deriveBits):
+        * crypto/algorithms/CryptoAlgorithmSHA1.cpp:
+        (WebCore::CryptoAlgorithmSHA1::digest):
+        * crypto/algorithms/CryptoAlgorithmSHA224.cpp:
+        (WebCore::CryptoAlgorithmSHA224::digest):
+        * crypto/algorithms/CryptoAlgorithmSHA256.cpp:
+        (WebCore::CryptoAlgorithmSHA256::digest):
+        * crypto/algorithms/CryptoAlgorithmSHA384.cpp:
+        (WebCore::CryptoAlgorithmSHA384::digest):
+        * crypto/algorithms/CryptoAlgorithmSHA512.cpp:
+        (WebCore::CryptoAlgorithmSHA512::digest):
+        * crypto/mac/CryptoKeyRSAMac.cpp:
+        (WebCore::CryptoKeyRSA::generatePair):
+        * dom/BroadcastChannel.cpp:
+        (WebCore::BroadcastChannel::MainThreadBridge::registerChannel):
+        * dom/ScriptExecutionContext.cpp:
+        (WebCore::ScriptExecutionContext::ScriptExecutionContext):
+        (WebCore::ScriptExecutionContext::removeFromContextsMap):
+        (WebCore::ScriptExecutionContext::~ScriptExecutionContext):
+        * dom/ScriptExecutionContext.h:
+        (WebCore::ScriptExecutionContext::identifier const):
+        (WebCore::ScriptExecutionContext::contextIdentifier const): Deleted.
+        * workers/WorkerGlobalScope.cpp:
+        (WebCore::m_credentials):
+        (WebCore::WorkerGlobalScope::~WorkerGlobalScope):
+
 2021-11-18  Alan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/Modules/mediacapabilities/MediaCapabilities.cpp

@@ -258 +258 @@
 
     m_decodingTasks.add(++m_nextTaskIdentifier, WTFMove(callback));
-    context.postTaskToResponsibleDocument([configuration = WTFMove(configuration).isolatedCopy(), contextIdentifier = context.contextIdentifier(), weakThis = WeakPtr { this }, taskIdentifier = m_nextTaskIdentifier](auto& document) mutable {
+    context.postTaskToResponsibleDocument([configuration = WTFMove(configuration).isolatedCopy(), contextIdentifier = context.identifier(), weakThis = WeakPtr { this }, taskIdentifier = m_nextTaskIdentifier](auto& document) mutable {
         gatherDecodingInfo(document, WTFMove(configuration), [contextIdentifier, weakThis = WTFMove(weakThis), taskIdentifier](auto&& result) mutable {
             ScriptExecutionContext::postTaskTo(contextIdentifier, [weakThis = WTFMove(weakThis), taskIdentifier, result = WTFMove(result).isolatedCopy()](auto&) mutable {
@@ -315 +315 @@
 
     m_encodingTasks.add(++m_nextTaskIdentifier, WTFMove(callback));
-    context.postTaskToResponsibleDocument([configuration = WTFMove(configuration).isolatedCopy(), contextIdentifier = context.contextIdentifier(), weakThis = WeakPtr { this }, taskIdentifier = m_nextTaskIdentifier](auto& document) mutable {
+    context.postTaskToResponsibleDocument([configuration = WTFMove(configuration).isolatedCopy(), contextIdentifier = context.identifier(), weakThis = WeakPtr { this }, taskIdentifier = m_nextTaskIdentifier](auto& document) mutable {
         gatherEncodingInfo(document, WTFMove(configuration), [contextIdentifier, weakThis = WTFMove(weakThis), taskIdentifier](auto&& result) mutable {
             ScriptExecutionContext::postTaskTo(contextIdentifier, [weakThis = WTFMove(weakThis), taskIdentifier, result = WTFMove(result).isolatedCopy()](auto&) mutable {

trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.cpp

@@ -72 +72 @@
             return;
         if (auto* context = channel->scriptExecutionContext())
-            channel->m_handler->setClient(*channel, context->contextIdentifier());
+            channel->m_handler->setClient(*channel, context->identifier());
     });
     return channel;
@@ -98 +98 @@
     , m_handler(WTFMove(handler))
     , m_identifier(RTCDataChannelIdentifier { Process::identifier(), ObjectIdentifier<RTCDataChannelLocalIdentifierType>::generateThreadSafe() })
-    , m_contextIdentifier(context.isDocument() ? ScriptExecutionContextIdentifier { } : context.contextIdentifier())
+    , m_contextIdentifier(context.isDocument() ? ScriptExecutionContextIdentifier { } : context.identifier())
     , m_label(WTFMove(label))
     , m_options(WTFMove(options))

trunk/Source/WebCore/Modules/mediastream/RTCRtpSFrameTransform.cpp

@@ -160 +160 @@
     m_transformer->setMediaType(backend.mediaType());
 
-    backend.setTransformableFrameCallback([transformer = m_transformer, identifier = context->contextIdentifier(), backend = Ref { backend }, weakThis = WeakPtr { *this }](auto&& frame) {
+    backend.setTransformableFrameCallback([transformer = m_transformer, identifier = context->identifier(), backend = Ref { backend }, weakThis = WeakPtr { *this }](auto&& frame) {
         auto chunk = frame->data();
         if (!chunk.data() || !chunk.size())
@@ -232 +232 @@
         // We do not want to throw any exception in the transform to make sure we do not error the transform.
         WTF::switchOn(frame, [&](RefPtr<RTCEncodedAudioFrame>& value) {
-            transformFrame(*value, globalObject, transformer.get(), *readableStreamSource, context.contextIdentifier(), weakThis);
+            transformFrame(*value, globalObject, transformer.get(), *readableStreamSource, context.identifier(), weakThis);
         }, [&](RefPtr<RTCEncodedVideoFrame>& value) {
-            transformFrame(*value, globalObject, transformer.get(), *readableStreamSource, context.contextIdentifier(), weakThis);
+            transformFrame(*value, globalObject, transformer.get(), *readableStreamSource, context.identifier(), weakThis);
         }, [&](RefPtr<ArrayBuffer>& value) {
-            transformFrame({ static_cast<const uint8_t*>(value->data()), value->byteLength() }, globalObject, transformer.get(), *readableStreamSource, context.contextIdentifier(), weakThis);
+            transformFrame({ static_cast<const uint8_t*>(value->data()), value->byteLength() }, globalObject, transformer.get(), *readableStreamSource, context.identifier(), weakThis);
         }, [&](RefPtr<ArrayBufferView>& value) {
-            transformFrame({ static_cast<const uint8_t*>(value->data()), value->byteLength() }, globalObject, transformer.get(), *readableStreamSource, context.contextIdentifier(), weakThis);
+            transformFrame({ static_cast<const uint8_t*>(value->data()), value->byteLength() }, globalObject, transformer.get(), *readableStreamSource, context.identifier(), weakThis);
         });
         return { };

trunk/Source/WebCore/crypto/CryptoAlgorithm.cpp

@@ -97 +97 @@
 {
     workQueue.dispatch(
-        [operation = WTFMove(operation), callback = WTFMove(callback), exceptionCallback = WTFMove(exceptionCallback), contextIdentifier = context.contextIdentifier()]() mutable {
+        [operation = WTFMove(operation), callback = WTFMove(callback), exceptionCallback = WTFMove(exceptionCallback), contextIdentifier = context.identifier()]() mutable {
             auto result = operation();
             ScriptExecutionContext::postTaskTo(contextIdentifier, [result = crossThreadCopy(result), callback = WTFMove(callback), exceptionCallback = WTFMove(exceptionCallback)](auto&) mutable {

trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmECDH.cpp

@@ -112 +112 @@
     // the result validation and callback dispatch into unifiedCallback.
     workQueue.dispatch(
-        [baseKey = WTFMove(baseKey), publicKey = ecParameters.publicKey, length, unifiedCallback = WTFMove(unifiedCallback), contextIdentifier = context.contextIdentifier()]() mutable {
+        [baseKey = WTFMove(baseKey), publicKey = ecParameters.publicKey, length, unifiedCallback = WTFMove(unifiedCallback), contextIdentifier = context.identifier()]() mutable {
             auto derivedKey = platformDeriveBits(downcast<CryptoKeyEC>(baseKey.get()), downcast<CryptoKeyEC>(*publicKey));
             ScriptExecutionContext::postTaskTo(contextIdentifier, [derivedKey = WTFMove(derivedKey), length, unifiedCallback = WTFMove(unifiedCallback)](auto&) mutable {

trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA1.cpp

@@ -52 +52 @@
     }
 
-    workQueue.dispatch([digest = WTFMove(digest), message = WTFMove(message), callback = WTFMove(callback), contextIdentifier = context.contextIdentifier()]() mutable {
+    workQueue.dispatch([digest = WTFMove(digest), message = WTFMove(message), callback = WTFMove(callback), contextIdentifier = context.identifier()]() mutable {
         digest->addBytes(message.data(), message.size());
         auto result = digest->computeHash();

trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA224.cpp

@@ -52 +52 @@
     }
 
-    workQueue.dispatch([digest = WTFMove(digest), message = WTFMove(message), callback = WTFMove(callback), contextIdentifier = context.contextIdentifier()]() mutable {
+    workQueue.dispatch([digest = WTFMove(digest), message = WTFMove(message), callback = WTFMove(callback), contextIdentifier = context.identifier()]() mutable {
         digest->addBytes(message.data(), message.size());
         auto result = digest->computeHash();

trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA256.cpp

@@ -52 +52 @@
     }
 
-    workQueue.dispatch([digest = WTFMove(digest), message = WTFMove(message), callback = WTFMove(callback), contextIdentifier = context.contextIdentifier()]() mutable {
+    workQueue.dispatch([digest = WTFMove(digest), message = WTFMove(message), callback = WTFMove(callback), contextIdentifier = context.identifier()]() mutable {
         digest->addBytes(message.data(), message.size());
         auto result = digest->computeHash();

trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA384.cpp

@@ -52 +52 @@
     }
 
-    workQueue.dispatch([digest = WTFMove(digest), message = WTFMove(message), callback = WTFMove(callback), contextIdentifier = context.contextIdentifier()]() mutable {
+    workQueue.dispatch([digest = WTFMove(digest), message = WTFMove(message), callback = WTFMove(callback), contextIdentifier = context.identifier()]() mutable {
         digest->addBytes(message.data(), message.size());
         auto result = digest->computeHash();

trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA512.cpp

@@ -52 +52 @@
     }
 
-    workQueue.dispatch([digest = WTFMove(digest), message = WTFMove(message), callback = WTFMove(callback), contextIdentifier = context.contextIdentifier()]() mutable {
+    workQueue.dispatch([digest = WTFMove(digest), message = WTFMove(message), callback = WTFMove(callback), contextIdentifier = context.identifier()]() mutable {
         digest->addBytes(message.data(), message.size());
         auto result = digest->computeHash();

trunk/Source/WebCore/crypto/mac/CryptoKeyRSAMac.cpp

@@ -278 +278 @@
     __block auto blockCallback(WTFMove(callback));
     __block auto blockFailureCallback(WTFMove(failureCallback));
-    auto contextIdentifier = context->contextIdentifier();
+    auto contextIdentifier = context->identifier();
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
         CCRSACryptorRef ccPublicKey = nullptr;

trunk/Source/WebCore/dom/BroadcastChannel.cpp

@@ -119 +119 @@
 void BroadcastChannel::MainThreadBridge::registerChannel()
 {
-    ensureOnMainThread([this, contextIdentifier = m_broadcastChannel->scriptExecutionContext()->contextIdentifier()](auto& document) {
+    ensureOnMainThread([this, contextIdentifier = m_broadcastChannel->scriptExecutionContext()->identifier()](auto& document) {
         m_origin = { shouldPartitionOrigin(document) ? document.topOrigin().data() : document.securityOrigin().data(), document.securityOrigin().data() };
         if (auto* page = document.page())

trunk/Source/WebCore/dom/ScriptExecutionContext.cpp

@@ -115 +115 @@
 
 ScriptExecutionContext::ScriptExecutionContext()
-    : m_contextIdentifier(ScriptExecutionContextIdentifier::generateThreadSafe())
+    : m_identifier(ScriptExecutionContextIdentifier::generateThreadSafe())
 {
     Locker locker { allScriptExecutionContextsMapLock };
-    allScriptExecutionContextsMap().add(m_contextIdentifier, this);
+    allScriptExecutionContextsMap().add(m_identifier, this);
 }
 
@@ -124 +124 @@
 {
     Locker locker { allScriptExecutionContextsMapLock };
-    ASSERT(allScriptExecutionContextsMap().contains(m_contextIdentifier));
-    allScriptExecutionContextsMap().remove(m_contextIdentifier);
+    ASSERT(allScriptExecutionContextsMap().contains(m_identifier));
+    allScriptExecutionContextsMap().remove(m_identifier);
 }
 
@@ -159 +159 @@
     {
         Locker locker { allScriptExecutionContextsMapLock };
-        ASSERT_WITH_MESSAGE(!allScriptExecutionContextsMap().contains(m_contextIdentifier), "A ScriptExecutionContext subclass instance implementing postTask should have already removed itself from the map");
+        ASSERT_WITH_MESSAGE(!allScriptExecutionContextsMap().contains(m_identifier), "A ScriptExecutionContext subclass instance implementing postTask should have already removed itself from the map");
     }
 

trunk/Source/WebCore/dom/ScriptExecutionContext.h

@@ -284 +284 @@
     WEBCORE_EXPORT static bool ensureOnContextThread(ScriptExecutionContextIdentifier, Task&&);
 
-    // FIXME: Port call sites to identifier() and drop this function.
-    ScriptExecutionContextIdentifier contextIdentifier() const { return m_contextIdentifier; }
-    ScriptExecutionContextIdentifier identifier() const { return m_contextIdentifier; }
+    ScriptExecutionContextIdentifier identifier() const { return m_identifier; }
 
 protected:
@@ -364 +362 @@
 
     String m_domainForCachePartition;
-    mutable ScriptExecutionContextIdentifier m_contextIdentifier;
+    mutable ScriptExecutionContextIdentifier m_identifier;
 };
 

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

@@ -58 +58 @@
 {
     return Protocol::ServiceWorker::Configuration::create()
-        .setTargetId(m_serviceWorkerGlobalScope.identifier())
+        .setTargetId(m_serviceWorkerGlobalScope.inspectorIdentifier())
         .setSecurityOrigin(m_serviceWorkerGlobalScope.securityOrigin()->toRawString())
         .setUrl(m_serviceWorkerGlobalScope.contextData().scriptURL.string())

trunk/Source/WebCore/page/cocoa/ResourceUsageThreadCocoa.mm

@@ -179 +179 @@
             mach_port_t machThread = thread->thread()->machThread();
             if (MACH_PORT_VALID(machThread))
-                knownWorkerThreads.set(machThread, thread->identifier().isolatedCopy());
+                knownWorkerThreads.set(machThread, thread->inspectorIdentifier().isolatedCopy());
         }
     }

trunk/Source/WebCore/workers/WorkerGlobalScope.cpp

@@ -89 +89 @@
     : WorkerOrWorkletGlobalScope(type, isMainThread() ? Ref { commonVM() } : JSC::VM::create(), &thread)
     , m_url(params.scriptURL)
-    , m_identifier(params.identifier)
+    , m_inspectorIdentifier(params.inspectorIdentifier)
     , m_userAgent(params.userAgent)
     , m_isOnline(params.isOnline)
@@ -104 +104 @@
     {
         Locker locker { allWorkerGlobalScopeIdentifiersLock };
-        allWorkerGlobalScopeIdentifiers().add(contextIdentifier());
+        allWorkerGlobalScopeIdentifiers().add(identifier());
     }
 
@@ -125 +125 @@
     {
         Locker locker { allWorkerGlobalScopeIdentifiersLock };
-        allWorkerGlobalScopeIdentifiers().remove(contextIdentifier());
+        allWorkerGlobalScopeIdentifiers().remove(identifier());
     }
 

trunk/Source/WebCore/workers/WorkerGlobalScope.h

@@ -80 +80 @@
     const URL& url() const final { return m_url; }
     String origin() const;
-    const String& identifier() const { return m_identifier; }
+    const String& inspectorIdentifier() const { return m_inspectorIdentifier; }
 
     IDBClient::IDBConnectionProxy* idbConnectionProxy() final;
@@ -178 +178 @@
 
     EventTarget* errorEventTarget() final;
-    String resourceRequestIdentifier() const final { return m_identifier; }
+    String resourceRequestIdentifier() const final { return m_inspectorIdentifier; }
     SocketProvider* socketProvider() final;
     RefPtr<RTCDataChannelRemoteHandlerConnection> createRTCDataChannelRemoteHandlerConnection() final;
@@ -192 +192 @@
 
     URL m_url;
-    String m_identifier;
+    String m_inspectorIdentifier;
     String m_userAgent;
 

trunk/Source/WebCore/workers/WorkerOrWorkletThread.cpp

@@ -67 +67 @@
 }
 
-WorkerOrWorkletThread::WorkerOrWorkletThread(const String& identifier, WorkerThreadMode workerThreadMode)
-    : m_identifier(identifier)
+WorkerOrWorkletThread::WorkerOrWorkletThread(const String& inspectorIdentifier, WorkerThreadMode workerThreadMode)
+    : m_inspectorIdentifier(inspectorIdentifier)
     , m_runLoop(constructRunLoop(workerThreadMode))
 {

trunk/Source/WebCore/workers/WorkerOrWorkletThread.h

@@ -64 +64 @@
     void resume();
 
-    const String& identifier() const { return m_identifier; }
+    const String& inspectorIdentifier() const { return m_inspectorIdentifier; }
 
     static HashSet<WorkerOrWorkletThread*>& workerOrWorkletThreads() WTF_REQUIRES_LOCK(workerOrWorkletThreadsLock());
@@ -71 +71 @@
 
 protected:
-    explicit WorkerOrWorkletThread(const String& identifier, WorkerThreadMode = WorkerThreadMode::CreateNewThread);
+    explicit WorkerOrWorkletThread(const String& inspectorIdentifier, WorkerThreadMode = WorkerThreadMode::CreateNewThread);
     void workerOrWorkletThread();
 
@@ -85 +85 @@
     static Lock s_workerOrWorkletThreadsLock;
 
-    String m_identifier;
+    String m_inspectorIdentifier;
     Lock m_threadCreationAndGlobalScopeLock;
     RefPtr<WorkerOrWorkletGlobalScope> m_globalScope;

trunk/Source/WebCore/workers/WorkerThread.cpp

@@ -51 +51 @@
         scriptURL.isolatedCopy(),
         name.isolatedCopy(),
-        identifier.isolatedCopy(),
+        inspectorIdentifier.isolatedCopy(),
         userAgent.isolatedCopy(),
         isOnline,
@@ -88 +88 @@
 
 WorkerThread::WorkerThread(const WorkerParameters& params, const ScriptBuffer& sourceCode, WorkerLoaderProxy& workerLoaderProxy, WorkerDebuggerProxy& workerDebuggerProxy, WorkerReportingProxy& workerReportingProxy, WorkerThreadStartMode startMode, const SecurityOrigin& topOrigin, IDBClient::IDBConnectionProxy* connectionProxy, SocketProvider* socketProvider, JSC::RuntimeFlags runtimeFlags)
-    : WorkerOrWorkletThread(params.identifier.isolatedCopy(), params.workerThreadMode)
+    : WorkerOrWorkletThread(params.inspectorIdentifier.isolatedCopy(), params.workerThreadMode)
     , m_workerLoaderProxy(workerLoaderProxy)
     , m_workerDebuggerProxy(workerDebuggerProxy)

trunk/Source/WebCore/workers/WorkerThread.h

@@ -62 +62 @@
     URL scriptURL;
     String name;
-    String identifier;
+    String inspectorIdentifier;
     String userAgent;
     bool isOnline;