<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[286025] trunk/Source/WebCore</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/286025">286025</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2021-11-18 13:28:14 -0800 (Thu, 18 Nov 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>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):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediacapabilitiesMediaCapabilitiescpp">trunk/Source/WebCore/Modules/mediacapabilities/MediaCapabilities.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCDataChannelcpp">trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCRtpSFrameTransformcpp">trunk/Source/WebCore/Modules/mediastream/RTCRtpSFrameTransform.cpp</a></li>
<li><a href="#trunkSourceWebCorecryptoCryptoAlgorithmcpp">trunk/Source/WebCore/crypto/CryptoAlgorithm.cpp</a></li>
<li><a href="#trunkSourceWebCorecryptoalgorithmsCryptoAlgorithmECDHcpp">trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmECDH.cpp</a></li>
<li><a href="#trunkSourceWebCorecryptoalgorithmsCryptoAlgorithmSHA1cpp">trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA1.cpp</a></li>
<li><a href="#trunkSourceWebCorecryptoalgorithmsCryptoAlgorithmSHA224cpp">trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA224.cpp</a></li>
<li><a href="#trunkSourceWebCorecryptoalgorithmsCryptoAlgorithmSHA256cpp">trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA256.cpp</a></li>
<li><a href="#trunkSourceWebCorecryptoalgorithmsCryptoAlgorithmSHA384cpp">trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA384.cpp</a></li>
<li><a href="#trunkSourceWebCorecryptoalgorithmsCryptoAlgorithmSHA512cpp">trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA512.cpp</a></li>
<li><a href="#trunkSourceWebCorecryptomacCryptoKeyRSAMaccpp">trunk/Source/WebCore/crypto/mac/CryptoKeyRSAMac.cpp</a></li>
<li><a href="#trunkSourceWebCoredomBroadcastChannelcpp">trunk/Source/WebCore/dom/BroadcastChannel.cpp</a></li>
<li><a href="#trunkSourceWebCoredomScriptExecutionContextcpp">trunk/Source/WebCore/dom/ScriptExecutionContext.cpp</a></li>
<li><a href="#trunkSourceWebCoredomScriptExecutionContexth">trunk/Source/WebCore/dom/ScriptExecutionContext.h</a></li>
<li><a href="#trunkSourceWebCoreinspectoragentsworkerServiceWorkerAgentcpp">trunk/Source/WebCore/inspector/agents/worker/ServiceWorkerAgent.cpp</a></li>
<li><a href="#trunkSourceWebCorepagecocoaResourceUsageThreadCocoamm">trunk/Source/WebCore/page/cocoa/ResourceUsageThreadCocoa.mm</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerGlobalScopecpp">trunk/Source/WebCore/workers/WorkerGlobalScope.cpp</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerGlobalScopeh">trunk/Source/WebCore/workers/WorkerGlobalScope.h</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerOrWorkletThreadcpp">trunk/Source/WebCore/workers/WorkerOrWorkletThread.cpp</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerOrWorkletThreadh">trunk/Source/WebCore/workers/WorkerOrWorkletThread.h</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerThreadcpp">trunk/Source/WebCore/workers/WorkerThread.cpp</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerThreadh">trunk/Source/WebCore/workers/WorkerThread.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (286024 => 286025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-11-18 21:14:07 UTC (rev 286024)
+++ trunk/Source/WebCore/ChangeLog      2021-11-18 21:28:14 UTC (rev 286025)
</span><span class="lines">@@ -1,3 +1,50 @@
</span><ins>+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):
+
</ins><span class="cx"> 2021-11-18  Alan Bujtas  <zalan@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [IFC][Integration] Switching line layout path should invalidate preferred width
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacapabilitiesMediaCapabilitiescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacapabilities/MediaCapabilities.cpp (286024 => 286025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacapabilities/MediaCapabilities.cpp     2021-11-18 21:14:07 UTC (rev 286024)
+++ trunk/Source/WebCore/Modules/mediacapabilities/MediaCapabilities.cpp        2021-11-18 21:28:14 UTC (rev 286025)
</span><span class="lines">@@ -257,7 +257,7 @@
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     m_decodingTasks.add(++m_nextTaskIdentifier, WTFMove(callback));
</span><del>-    context.postTaskToResponsibleDocument([configuration = WTFMove(configuration).isolatedCopy(), contextIdentifier = context.contextIdentifier(), weakThis = WeakPtr { this }, taskIdentifier = m_nextTaskIdentifier](auto& document) mutable {
</del><ins>+    context.postTaskToResponsibleDocument([configuration = WTFMove(configuration).isolatedCopy(), contextIdentifier = context.identifier(), weakThis = WeakPtr { this }, taskIdentifier = m_nextTaskIdentifier](auto& document) mutable {
</ins><span class="cx">         gatherDecodingInfo(document, WTFMove(configuration), [contextIdentifier, weakThis = WTFMove(weakThis), taskIdentifier](auto&& result) mutable {
</span><span class="cx">             ScriptExecutionContext::postTaskTo(contextIdentifier, [weakThis = WTFMove(weakThis), taskIdentifier, result = WTFMove(result).isolatedCopy()](auto&) mutable {
</span><span class="cx">                 if (!weakThis)
</span><span class="lines">@@ -314,7 +314,7 @@
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     m_encodingTasks.add(++m_nextTaskIdentifier, WTFMove(callback));
</span><del>-    context.postTaskToResponsibleDocument([configuration = WTFMove(configuration).isolatedCopy(), contextIdentifier = context.contextIdentifier(), weakThis = WeakPtr { this }, taskIdentifier = m_nextTaskIdentifier](auto& document) mutable {
</del><ins>+    context.postTaskToResponsibleDocument([configuration = WTFMove(configuration).isolatedCopy(), contextIdentifier = context.identifier(), weakThis = WeakPtr { this }, taskIdentifier = m_nextTaskIdentifier](auto& document) mutable {
</ins><span class="cx">         gatherEncodingInfo(document, WTFMove(configuration), [contextIdentifier, weakThis = WTFMove(weakThis), taskIdentifier](auto&& result) mutable {
</span><span class="cx">             ScriptExecutionContext::postTaskTo(contextIdentifier, [weakThis = WTFMove(weakThis), taskIdentifier, result = WTFMove(result).isolatedCopy()](auto&) mutable {
</span><span class="cx">                 if (!weakThis)
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCDataChannelcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.cpp (286024 => 286025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.cpp      2021-11-18 21:14:07 UTC (rev 286024)
+++ trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.cpp 2021-11-18 21:28:14 UTC (rev 286025)
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx">         if (!channel->m_handler)
</span><span class="cx">             return;
</span><span class="cx">         if (auto* context = channel->scriptExecutionContext())
</span><del>-            channel->m_handler->setClient(*channel, context->contextIdentifier());
</del><ins>+            channel->m_handler->setClient(*channel, context->identifier());
</ins><span class="cx">     });
</span><span class="cx">     return channel;
</span><span class="cx"> }
</span><span class="lines">@@ -97,7 +97,7 @@
</span><span class="cx">     : ActiveDOMObject(&context)
</span><span class="cx">     , m_handler(WTFMove(handler))
</span><span class="cx">     , m_identifier(RTCDataChannelIdentifier { Process::identifier(), ObjectIdentifier<RTCDataChannelLocalIdentifierType>::generateThreadSafe() })
</span><del>-    , m_contextIdentifier(context.isDocument() ? ScriptExecutionContextIdentifier { } : context.contextIdentifier())
</del><ins>+    , m_contextIdentifier(context.isDocument() ? ScriptExecutionContextIdentifier { } : context.identifier())
</ins><span class="cx">     , m_label(WTFMove(label))
</span><span class="cx">     , m_options(WTFMove(options))
</span><span class="cx">     , m_messageQueue(createMessageQueue(context, *this))
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCRtpSFrameTransformcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCRtpSFrameTransform.cpp (286024 => 286025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCRtpSFrameTransform.cpp       2021-11-18 21:14:07 UTC (rev 286024)
+++ trunk/Source/WebCore/Modules/mediastream/RTCRtpSFrameTransform.cpp  2021-11-18 21:28:14 UTC (rev 286025)
</span><span class="lines">@@ -159,7 +159,7 @@
</span><span class="cx">     m_transformer->setIsEncrypting(side == Side::Sender);
</span><span class="cx">     m_transformer->setMediaType(backend.mediaType());
</span><span class="cx"> 
</span><del>-    backend.setTransformableFrameCallback([transformer = m_transformer, identifier = context->contextIdentifier(), backend = Ref { backend }, weakThis = WeakPtr { *this }](auto&& frame) {
</del><ins>+    backend.setTransformableFrameCallback([transformer = m_transformer, identifier = context->identifier(), backend = Ref { backend }, weakThis = WeakPtr { *this }](auto&& frame) {
</ins><span class="cx">         auto chunk = frame->data();
</span><span class="cx">         if (!chunk.data() || !chunk.size())
</span><span class="cx">             return;
</span><span class="lines">@@ -231,13 +231,13 @@
</span><span class="cx"> 
</span><span class="cx">         // We do not want to throw any exception in the transform to make sure we do not error the transform.
</span><span class="cx">         WTF::switchOn(frame, [&](RefPtr<RTCEncodedAudioFrame>& value) {
</span><del>-            transformFrame(*value, globalObject, transformer.get(), *readableStreamSource, context.contextIdentifier(), weakThis);
</del><ins>+            transformFrame(*value, globalObject, transformer.get(), *readableStreamSource, context.identifier(), weakThis);
</ins><span class="cx">         }, [&](RefPtr<RTCEncodedVideoFrame>& value) {
</span><del>-            transformFrame(*value, globalObject, transformer.get(), *readableStreamSource, context.contextIdentifier(), weakThis);
</del><ins>+            transformFrame(*value, globalObject, transformer.get(), *readableStreamSource, context.identifier(), weakThis);
</ins><span class="cx">         }, [&](RefPtr<ArrayBuffer>& value) {
</span><del>-            transformFrame({ static_cast<const uint8_t*>(value->data()), value->byteLength() }, globalObject, transformer.get(), *readableStreamSource, context.contextIdentifier(), weakThis);
</del><ins>+            transformFrame({ static_cast<const uint8_t*>(value->data()), value->byteLength() }, globalObject, transformer.get(), *readableStreamSource, context.identifier(), weakThis);
</ins><span class="cx">         }, [&](RefPtr<ArrayBufferView>& value) {
</span><del>-            transformFrame({ static_cast<const uint8_t*>(value->data()), value->byteLength() }, globalObject, transformer.get(), *readableStreamSource, context.contextIdentifier(), weakThis);
</del><ins>+            transformFrame({ static_cast<const uint8_t*>(value->data()), value->byteLength() }, globalObject, transformer.get(), *readableStreamSource, context.identifier(), weakThis);
</ins><span class="cx">         });
</span><span class="cx">         return { };
</span><span class="cx">     }));
</span></span></pre></div>
<a id="trunkSourceWebCorecryptoCryptoAlgorithmcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/crypto/CryptoAlgorithm.cpp (286024 => 286025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/crypto/CryptoAlgorithm.cpp  2021-11-18 21:14:07 UTC (rev 286024)
+++ trunk/Source/WebCore/crypto/CryptoAlgorithm.cpp     2021-11-18 21:28:14 UTC (rev 286025)
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx"> static void dispatchAlgorithmOperation(WorkQueue& workQueue, ScriptExecutionContext& context, ResultCallbackType&& callback, CryptoAlgorithm::ExceptionCallback&& exceptionCallback, OperationType&& operation)
</span><span class="cx"> {
</span><span class="cx">     workQueue.dispatch(
</span><del>-        [operation = WTFMove(operation), callback = WTFMove(callback), exceptionCallback = WTFMove(exceptionCallback), contextIdentifier = context.contextIdentifier()]() mutable {
</del><ins>+        [operation = WTFMove(operation), callback = WTFMove(callback), exceptionCallback = WTFMove(exceptionCallback), contextIdentifier = context.identifier()]() mutable {
</ins><span class="cx">             auto result = operation();
</span><span class="cx">             ScriptExecutionContext::postTaskTo(contextIdentifier, [result = crossThreadCopy(result), callback = WTFMove(callback), exceptionCallback = WTFMove(exceptionCallback)](auto&) mutable {
</span><span class="cx">                 if (result.hasException()) {
</span></span></pre></div>
<a id="trunkSourceWebCorecryptoalgorithmsCryptoAlgorithmECDHcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmECDH.cpp (286024 => 286025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmECDH.cpp   2021-11-18 21:14:07 UTC (rev 286024)
+++ trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmECDH.cpp      2021-11-18 21:28:14 UTC (rev 286025)
</span><span class="lines">@@ -111,7 +111,7 @@
</span><span class="cx">     // This is a special case that can't use dispatchOperation() because it bundles
</span><span class="cx">     // the result validation and callback dispatch into unifiedCallback.
</span><span class="cx">     workQueue.dispatch(
</span><del>-        [baseKey = WTFMove(baseKey), publicKey = ecParameters.publicKey, length, unifiedCallback = WTFMove(unifiedCallback), contextIdentifier = context.contextIdentifier()]() mutable {
</del><ins>+        [baseKey = WTFMove(baseKey), publicKey = ecParameters.publicKey, length, unifiedCallback = WTFMove(unifiedCallback), contextIdentifier = context.identifier()]() mutable {
</ins><span class="cx">             auto derivedKey = platformDeriveBits(downcast<CryptoKeyEC>(baseKey.get()), downcast<CryptoKeyEC>(*publicKey));
</span><span class="cx">             ScriptExecutionContext::postTaskTo(contextIdentifier, [derivedKey = WTFMove(derivedKey), length, unifiedCallback = WTFMove(unifiedCallback)](auto&) mutable {
</span><span class="cx">                 unifiedCallback(WTFMove(derivedKey), length);
</span></span></pre></div>
<a id="trunkSourceWebCorecryptoalgorithmsCryptoAlgorithmSHA1cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA1.cpp (286024 => 286025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA1.cpp   2021-11-18 21:14:07 UTC (rev 286024)
+++ trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA1.cpp      2021-11-18 21:28:14 UTC (rev 286025)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx">         return;
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    workQueue.dispatch([digest = WTFMove(digest), message = WTFMove(message), callback = WTFMove(callback), contextIdentifier = context.contextIdentifier()]() mutable {
</del><ins>+    workQueue.dispatch([digest = WTFMove(digest), message = WTFMove(message), callback = WTFMove(callback), contextIdentifier = context.identifier()]() mutable {
</ins><span class="cx">         digest->addBytes(message.data(), message.size());
</span><span class="cx">         auto result = digest->computeHash();
</span><span class="cx">         ScriptExecutionContext::postTaskTo(contextIdentifier, [callback = WTFMove(callback), result = WTFMove(result)](auto&) {
</span></span></pre></div>
<a id="trunkSourceWebCorecryptoalgorithmsCryptoAlgorithmSHA224cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA224.cpp (286024 => 286025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA224.cpp 2021-11-18 21:14:07 UTC (rev 286024)
+++ trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA224.cpp    2021-11-18 21:28:14 UTC (rev 286025)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx">         return;
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    workQueue.dispatch([digest = WTFMove(digest), message = WTFMove(message), callback = WTFMove(callback), contextIdentifier = context.contextIdentifier()]() mutable {
</del><ins>+    workQueue.dispatch([digest = WTFMove(digest), message = WTFMove(message), callback = WTFMove(callback), contextIdentifier = context.identifier()]() mutable {
</ins><span class="cx">         digest->addBytes(message.data(), message.size());
</span><span class="cx">         auto result = digest->computeHash();
</span><span class="cx">         ScriptExecutionContext::postTaskTo(contextIdentifier, [callback = WTFMove(callback), result = WTFMove(result)](auto&) {
</span></span></pre></div>
<a id="trunkSourceWebCorecryptoalgorithmsCryptoAlgorithmSHA256cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA256.cpp (286024 => 286025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA256.cpp 2021-11-18 21:14:07 UTC (rev 286024)
+++ trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA256.cpp    2021-11-18 21:28:14 UTC (rev 286025)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx">         return;
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    workQueue.dispatch([digest = WTFMove(digest), message = WTFMove(message), callback = WTFMove(callback), contextIdentifier = context.contextIdentifier()]() mutable {
</del><ins>+    workQueue.dispatch([digest = WTFMove(digest), message = WTFMove(message), callback = WTFMove(callback), contextIdentifier = context.identifier()]() mutable {
</ins><span class="cx">         digest->addBytes(message.data(), message.size());
</span><span class="cx">         auto result = digest->computeHash();
</span><span class="cx">         ScriptExecutionContext::postTaskTo(contextIdentifier, [callback = WTFMove(callback), result = WTFMove(result)](auto&) {
</span></span></pre></div>
<a id="trunkSourceWebCorecryptoalgorithmsCryptoAlgorithmSHA384cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA384.cpp (286024 => 286025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA384.cpp 2021-11-18 21:14:07 UTC (rev 286024)
+++ trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA384.cpp    2021-11-18 21:28:14 UTC (rev 286025)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx">         return;
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    workQueue.dispatch([digest = WTFMove(digest), message = WTFMove(message), callback = WTFMove(callback), contextIdentifier = context.contextIdentifier()]() mutable {
</del><ins>+    workQueue.dispatch([digest = WTFMove(digest), message = WTFMove(message), callback = WTFMove(callback), contextIdentifier = context.identifier()]() mutable {
</ins><span class="cx">         digest->addBytes(message.data(), message.size());
</span><span class="cx">         auto result = digest->computeHash();
</span><span class="cx">         ScriptExecutionContext::postTaskTo(contextIdentifier, [callback = WTFMove(callback), result = WTFMove(result)](auto&) {
</span></span></pre></div>
<a id="trunkSourceWebCorecryptoalgorithmsCryptoAlgorithmSHA512cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA512.cpp (286024 => 286025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA512.cpp 2021-11-18 21:14:07 UTC (rev 286024)
+++ trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA512.cpp    2021-11-18 21:28:14 UTC (rev 286025)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx">         return;
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    workQueue.dispatch([digest = WTFMove(digest), message = WTFMove(message), callback = WTFMove(callback), contextIdentifier = context.contextIdentifier()]() mutable {
</del><ins>+    workQueue.dispatch([digest = WTFMove(digest), message = WTFMove(message), callback = WTFMove(callback), contextIdentifier = context.identifier()]() mutable {
</ins><span class="cx">         digest->addBytes(message.data(), message.size());
</span><span class="cx">         auto result = digest->computeHash();
</span><span class="cx">         ScriptExecutionContext::postTaskTo(contextIdentifier, [callback = WTFMove(callback), result = WTFMove(result)](auto&) {
</span></span></pre></div>
<a id="trunkSourceWebCorecryptomacCryptoKeyRSAMaccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/crypto/mac/CryptoKeyRSAMac.cpp (286024 => 286025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/crypto/mac/CryptoKeyRSAMac.cpp      2021-11-18 21:14:07 UTC (rev 286024)
+++ trunk/Source/WebCore/crypto/mac/CryptoKeyRSAMac.cpp 2021-11-18 21:28:14 UTC (rev 286025)
</span><span class="lines">@@ -277,7 +277,7 @@
</span><span class="cx"> 
</span><span class="cx">     __block auto blockCallback(WTFMove(callback));
</span><span class="cx">     __block auto blockFailureCallback(WTFMove(failureCallback));
</span><del>-    auto contextIdentifier = context->contextIdentifier();
</del><ins>+    auto contextIdentifier = context->identifier();
</ins><span class="cx">     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
</span><span class="cx">         CCRSACryptorRef ccPublicKey = nullptr;
</span><span class="cx">         CCRSACryptorRef ccPrivateKey = nullptr;
</span></span></pre></div>
<a id="trunkSourceWebCoredomBroadcastChannelcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/BroadcastChannel.cpp (286024 => 286025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/BroadcastChannel.cpp    2021-11-18 21:14:07 UTC (rev 286024)
+++ trunk/Source/WebCore/dom/BroadcastChannel.cpp       2021-11-18 21:28:14 UTC (rev 286025)
</span><span class="lines">@@ -118,7 +118,7 @@
</span><span class="cx"> 
</span><span class="cx"> void BroadcastChannel::MainThreadBridge::registerChannel()
</span><span class="cx"> {
</span><del>-    ensureOnMainThread([this, contextIdentifier = m_broadcastChannel->scriptExecutionContext()->contextIdentifier()](auto& document) {
</del><ins>+    ensureOnMainThread([this, contextIdentifier = m_broadcastChannel->scriptExecutionContext()->identifier()](auto& document) {
</ins><span class="cx">         m_origin = { shouldPartitionOrigin(document) ? document.topOrigin().data() : document.securityOrigin().data(), document.securityOrigin().data() };
</span><span class="cx">         if (auto* page = document.page())
</span><span class="cx">             page->broadcastChannelRegistry().registerChannel(m_origin, m_name, m_identifier);
</span></span></pre></div>
<a id="trunkSourceWebCoredomScriptExecutionContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ScriptExecutionContext.cpp (286024 => 286025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ScriptExecutionContext.cpp      2021-11-18 21:14:07 UTC (rev 286024)
+++ trunk/Source/WebCore/dom/ScriptExecutionContext.cpp 2021-11-18 21:28:14 UTC (rev 286025)
</span><span class="lines">@@ -114,17 +114,17 @@
</span><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> ScriptExecutionContext::ScriptExecutionContext()
</span><del>-    : m_contextIdentifier(ScriptExecutionContextIdentifier::generateThreadSafe())
</del><ins>+    : m_identifier(ScriptExecutionContextIdentifier::generateThreadSafe())
</ins><span class="cx"> {
</span><span class="cx">     Locker locker { allScriptExecutionContextsMapLock };
</span><del>-    allScriptExecutionContextsMap().add(m_contextIdentifier, this);
</del><ins>+    allScriptExecutionContextsMap().add(m_identifier, this);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void ScriptExecutionContext::removeFromContextsMap()
</span><span class="cx"> {
</span><span class="cx">     Locker locker { allScriptExecutionContextsMapLock };
</span><del>-    ASSERT(allScriptExecutionContextsMap().contains(m_contextIdentifier));
-    allScriptExecutionContextsMap().remove(m_contextIdentifier);
</del><ins>+    ASSERT(allScriptExecutionContextsMap().contains(m_identifier));
+    allScriptExecutionContextsMap().remove(m_identifier);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> #if !ASSERT_ENABLED
</span><span class="lines">@@ -158,7 +158,7 @@
</span><span class="cx"> #if ASSERT_ENABLED
</span><span class="cx">     {
</span><span class="cx">         Locker locker { allScriptExecutionContextsMapLock };
</span><del>-        ASSERT_WITH_MESSAGE(!allScriptExecutionContextsMap().contains(m_contextIdentifier), "A ScriptExecutionContext subclass instance implementing postTask should have already removed itself from the map");
</del><ins>+        ASSERT_WITH_MESSAGE(!allScriptExecutionContextsMap().contains(m_identifier), "A ScriptExecutionContext subclass instance implementing postTask should have already removed itself from the map");
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     m_inScriptExecutionContextDestructor = true;
</span></span></pre></div>
<a id="trunkSourceWebCoredomScriptExecutionContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ScriptExecutionContext.h (286024 => 286025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ScriptExecutionContext.h        2021-11-18 21:14:07 UTC (rev 286024)
+++ trunk/Source/WebCore/dom/ScriptExecutionContext.h   2021-11-18 21:28:14 UTC (rev 286025)
</span><span class="lines">@@ -283,9 +283,7 @@
</span><span class="cx">     WEBCORE_EXPORT static bool postTaskTo(ScriptExecutionContextIdentifier, Task&&);
</span><span class="cx">     WEBCORE_EXPORT static bool ensureOnContextThread(ScriptExecutionContextIdentifier, Task&&);
</span><span class="cx"> 
</span><del>-    // FIXME: Port call sites to identifier() and drop this function.
-    ScriptExecutionContextIdentifier contextIdentifier() const { return m_contextIdentifier; }
-    ScriptExecutionContextIdentifier identifier() const { return m_contextIdentifier; }
</del><ins>+    ScriptExecutionContextIdentifier identifier() const { return m_identifier; }
</ins><span class="cx"> 
</span><span class="cx"> protected:
</span><span class="cx">     class AddConsoleMessageTask : public Task {
</span><span class="lines">@@ -363,7 +361,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx">     String m_domainForCachePartition;
</span><del>-    mutable ScriptExecutionContextIdentifier m_contextIdentifier;
</del><ins>+    mutable ScriptExecutionContextIdentifier m_identifier;
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectoragentsworkerServiceWorkerAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/agents/worker/ServiceWorkerAgent.cpp (286024 => 286025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/agents/worker/ServiceWorkerAgent.cpp      2021-11-18 21:14:07 UTC (rev 286024)
+++ trunk/Source/WebCore/inspector/agents/worker/ServiceWorkerAgent.cpp 2021-11-18 21:28:14 UTC (rev 286025)
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx"> Protocol::ErrorStringOr<Ref<Protocol::ServiceWorker::Configuration>> ServiceWorkerAgent::getInitializationInfo()
</span><span class="cx"> {
</span><span class="cx">     return Protocol::ServiceWorker::Configuration::create()
</span><del>-        .setTargetId(m_serviceWorkerGlobalScope.identifier())
</del><ins>+        .setTargetId(m_serviceWorkerGlobalScope.inspectorIdentifier())
</ins><span class="cx">         .setSecurityOrigin(m_serviceWorkerGlobalScope.securityOrigin()->toRawString())
</span><span class="cx">         .setUrl(m_serviceWorkerGlobalScope.contextData().scriptURL.string())
</span><span class="cx">         .setContent(m_serviceWorkerGlobalScope.contextData().script.toString())
</span></span></pre></div>
<a id="trunkSourceWebCorepagecocoaResourceUsageThreadCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/cocoa/ResourceUsageThreadCocoa.mm (286024 => 286025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/cocoa/ResourceUsageThreadCocoa.mm      2021-11-18 21:14:07 UTC (rev 286024)
+++ trunk/Source/WebCore/page/cocoa/ResourceUsageThreadCocoa.mm 2021-11-18 21:28:14 UTC (rev 286025)
</span><span class="lines">@@ -178,7 +178,7 @@
</span><span class="cx">                 continue;
</span><span class="cx">             mach_port_t machThread = thread->thread()->machThread();
</span><span class="cx">             if (MACH_PORT_VALID(machThread))
</span><del>-                knownWorkerThreads.set(machThread, thread->identifier().isolatedCopy());
</del><ins>+                knownWorkerThreads.set(machThread, thread->inspectorIdentifier().isolatedCopy());
</ins><span class="cx">         }
</span><span class="cx">     }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerGlobalScopecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerGlobalScope.cpp (286024 => 286025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerGlobalScope.cpp       2021-11-18 21:14:07 UTC (rev 286024)
+++ trunk/Source/WebCore/workers/WorkerGlobalScope.cpp  2021-11-18 21:28:14 UTC (rev 286025)
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx"> WorkerGlobalScope::WorkerGlobalScope(WorkerThreadType type, const WorkerParameters& params, Ref<SecurityOrigin>&& origin, WorkerThread& thread, Ref<SecurityOrigin>&& topOrigin, IDBClient::IDBConnectionProxy* connectionProxy, SocketProvider* socketProvider)
</span><span class="cx">     : WorkerOrWorkletGlobalScope(type, isMainThread() ? Ref { commonVM() } : JSC::VM::create(), &thread)
</span><span class="cx">     , m_url(params.scriptURL)
</span><del>-    , m_identifier(params.identifier)
</del><ins>+    , m_inspectorIdentifier(params.inspectorIdentifier)
</ins><span class="cx">     , m_userAgent(params.userAgent)
</span><span class="cx">     , m_isOnline(params.isOnline)
</span><span class="cx">     , m_shouldBypassMainWorldContentSecurityPolicy(params.shouldBypassMainWorldContentSecurityPolicy)
</span><span class="lines">@@ -103,7 +103,7 @@
</span><span class="cx"> {
</span><span class="cx">     {
</span><span class="cx">         Locker locker { allWorkerGlobalScopeIdentifiersLock };
</span><del>-        allWorkerGlobalScopeIdentifiers().add(contextIdentifier());
</del><ins>+        allWorkerGlobalScopeIdentifiers().add(identifier());
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     if (m_topOrigin->hasUniversalAccess())
</span><span class="lines">@@ -124,7 +124,7 @@
</span><span class="cx"> 
</span><span class="cx">     {
</span><span class="cx">         Locker locker { allWorkerGlobalScopeIdentifiersLock };
</span><del>-        allWorkerGlobalScopeIdentifiers().remove(contextIdentifier());
</del><ins>+        allWorkerGlobalScopeIdentifiers().remove(identifier());
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     m_performance = nullptr;
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerGlobalScopeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerGlobalScope.h (286024 => 286025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerGlobalScope.h 2021-11-18 21:14:07 UTC (rev 286024)
+++ trunk/Source/WebCore/workers/WorkerGlobalScope.h    2021-11-18 21:28:14 UTC (rev 286025)
</span><span class="lines">@@ -79,7 +79,7 @@
</span><span class="cx"> 
</span><span class="cx">     const URL& url() const final { return m_url; }
</span><span class="cx">     String origin() const;
</span><del>-    const String& identifier() const { return m_identifier; }
</del><ins>+    const String& inspectorIdentifier() const { return m_inspectorIdentifier; }
</ins><span class="cx"> 
</span><span class="cx">     IDBClient::IDBConnectionProxy* idbConnectionProxy() final;
</span><span class="cx">     void suspend() final;
</span><span class="lines">@@ -177,7 +177,7 @@
</span><span class="cx">     String userAgent(const URL&) const final;
</span><span class="cx"> 
</span><span class="cx">     EventTarget* errorEventTarget() final;
</span><del>-    String resourceRequestIdentifier() const final { return m_identifier; }
</del><ins>+    String resourceRequestIdentifier() const final { return m_inspectorIdentifier; }
</ins><span class="cx">     SocketProvider* socketProvider() final;
</span><span class="cx">     RefPtr<RTCDataChannelRemoteHandlerConnection> createRTCDataChannelRemoteHandlerConnection() final;
</span><span class="cx"> 
</span><span class="lines">@@ -191,7 +191,7 @@
</span><span class="cx">     void stopIndexedDatabase();
</span><span class="cx"> 
</span><span class="cx">     URL m_url;
</span><del>-    String m_identifier;
</del><ins>+    String m_inspectorIdentifier;
</ins><span class="cx">     String m_userAgent;
</span><span class="cx"> 
</span><span class="cx">     mutable RefPtr<WorkerLocation> m_location;
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerOrWorkletThreadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerOrWorkletThread.cpp (286024 => 286025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerOrWorkletThread.cpp   2021-11-18 21:14:07 UTC (rev 286024)
+++ trunk/Source/WebCore/workers/WorkerOrWorkletThread.cpp      2021-11-18 21:28:14 UTC (rev 286025)
</span><span class="lines">@@ -66,8 +66,8 @@
</span><span class="cx">     return makeUniqueRef<WorkerDedicatedRunLoop>();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-WorkerOrWorkletThread::WorkerOrWorkletThread(const String& identifier, WorkerThreadMode workerThreadMode)
-    : m_identifier(identifier)
</del><ins>+WorkerOrWorkletThread::WorkerOrWorkletThread(const String& inspectorIdentifier, WorkerThreadMode workerThreadMode)
+    : m_inspectorIdentifier(inspectorIdentifier)
</ins><span class="cx">     , m_runLoop(constructRunLoop(workerThreadMode))
</span><span class="cx"> {
</span><span class="cx">     Locker locker { workerOrWorkletThreadsLock() };
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerOrWorkletThreadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerOrWorkletThread.h (286024 => 286025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerOrWorkletThread.h     2021-11-18 21:14:07 UTC (rev 286024)
+++ trunk/Source/WebCore/workers/WorkerOrWorkletThread.h        2021-11-18 21:28:14 UTC (rev 286025)
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx">     void suspend();
</span><span class="cx">     void resume();
</span><span class="cx"> 
</span><del>-    const String& identifier() const { return m_identifier; }
</del><ins>+    const String& inspectorIdentifier() const { return m_inspectorIdentifier; }
</ins><span class="cx"> 
</span><span class="cx">     static HashSet<WorkerOrWorkletThread*>& workerOrWorkletThreads() WTF_REQUIRES_LOCK(workerOrWorkletThreadsLock());
</span><span class="cx">     static Lock& workerOrWorkletThreadsLock() WTF_RETURNS_LOCK(s_workerOrWorkletThreadsLock);
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx">     static void releaseFastMallocFreeMemoryInAllThreads();
</span><span class="cx"> 
</span><span class="cx"> protected:
</span><del>-    explicit WorkerOrWorkletThread(const String& identifier, WorkerThreadMode = WorkerThreadMode::CreateNewThread);
</del><ins>+    explicit WorkerOrWorkletThread(const String& inspectorIdentifier, WorkerThreadMode = WorkerThreadMode::CreateNewThread);
</ins><span class="cx">     void workerOrWorkletThread();
</span><span class="cx"> 
</span><span class="cx">     // Executes the event loop for the worker thread. Derived classes can override to perform actions before/after entering the event loop.
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx"> 
</span><span class="cx">     static Lock s_workerOrWorkletThreadsLock;
</span><span class="cx"> 
</span><del>-    String m_identifier;
</del><ins>+    String m_inspectorIdentifier;
</ins><span class="cx">     Lock m_threadCreationAndGlobalScopeLock;
</span><span class="cx">     RefPtr<WorkerOrWorkletGlobalScope> m_globalScope;
</span><span class="cx">     RefPtr<Thread> m_thread;
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerThreadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerThread.cpp (286024 => 286025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerThread.cpp    2021-11-18 21:14:07 UTC (rev 286024)
+++ trunk/Source/WebCore/workers/WorkerThread.cpp       2021-11-18 21:28:14 UTC (rev 286025)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx">     return {
</span><span class="cx">         scriptURL.isolatedCopy(),
</span><span class="cx">         name.isolatedCopy(),
</span><del>-        identifier.isolatedCopy(),
</del><ins>+        inspectorIdentifier.isolatedCopy(),
</ins><span class="cx">         userAgent.isolatedCopy(),
</span><span class="cx">         isOnline,
</span><span class="cx">         contentSecurityPolicyResponseHeaders,
</span><span class="lines">@@ -87,7 +87,7 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> 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)
</span><del>-    : WorkerOrWorkletThread(params.identifier.isolatedCopy(), params.workerThreadMode)
</del><ins>+    : WorkerOrWorkletThread(params.inspectorIdentifier.isolatedCopy(), params.workerThreadMode)
</ins><span class="cx">     , m_workerLoaderProxy(workerLoaderProxy)
</span><span class="cx">     , m_workerDebuggerProxy(workerDebuggerProxy)
</span><span class="cx">     , m_workerReportingProxy(workerReportingProxy)
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerThreadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerThread.h (286024 => 286025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerThread.h      2021-11-18 21:14:07 UTC (rev 286024)
+++ trunk/Source/WebCore/workers/WorkerThread.h 2021-11-18 21:28:14 UTC (rev 286025)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx"> public:
</span><span class="cx">     URL scriptURL;
</span><span class="cx">     String name;
</span><del>-    String identifier;
</del><ins>+    String inspectorIdentifier;
</ins><span class="cx">     String userAgent;
</span><span class="cx">     bool isOnline;
</span><span class="cx">     ContentSecurityPolicyResponseHeaders contentSecurityPolicyResponseHeaders;
</span></span></pre>
</div>
</div>

</body>
</html>