<!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>[286499] 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/286499">286499</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2021-12-03 10:00:42 -0800 (Fri, 03 Dec 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Introduce WorkerGlobalScope::type() function
https://bugs.webkit.org/show_bug.cgi?id=233793

Reviewed by Alex Christensen.

Introduce WorkerGlobalScope::type() function to replace isDedicatedWorkerGlobalScope() / isServiceWorkerGlobalScope()
/ isSharedWorkerGlobalScope(). This is extracted from Alex's large patch at Bug 230382.

* workers/shared/SharedWorkerGlobalScope.h:
(isType):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreworkersDedicatedWorkerGlobalScopeh">trunk/Source/WebCore/workers/DedicatedWorkerGlobalScope.h</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerGlobalScopeh">trunk/Source/WebCore/workers/WorkerGlobalScope.h</a></li>
<li><a href="#trunkSourceWebCoreworkersserviceServiceWorkerGlobalScopeh">trunk/Source/WebCore/workers/service/ServiceWorkerGlobalScope.h</a></li>
<li><a href="#trunkSourceWebCoreworkerssharedSharedWorkerGlobalScopeh">trunk/Source/WebCore/workers/shared/SharedWorkerGlobalScope.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (286498 => 286499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-12-03 17:45:21 UTC (rev 286498)
+++ trunk/Source/WebCore/ChangeLog      2021-12-03 18:00:42 UTC (rev 286499)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2021-12-03  Chris Dumez  <cdumez@apple.com>
+
+        Introduce WorkerGlobalScope::type() function
+        https://bugs.webkit.org/show_bug.cgi?id=233793
+
+        Reviewed by Alex Christensen.
+
+        Introduce WorkerGlobalScope::type() function to replace isDedicatedWorkerGlobalScope() / isServiceWorkerGlobalScope()
+        / isSharedWorkerGlobalScope(). This is extracted from Alex's large patch at Bug 230382.
+
+        * workers/shared/SharedWorkerGlobalScope.h:
+        (isType):
+
</ins><span class="cx"> 2021-12-03  Youenn Fablet  <youenn@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Improve dictionary-based DOMPromiseDeferred::settle
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersDedicatedWorkerGlobalScopeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/DedicatedWorkerGlobalScope.h (286498 => 286499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/DedicatedWorkerGlobalScope.h        2021-12-03 17:45:21 UTC (rev 286498)
+++ trunk/Source/WebCore/workers/DedicatedWorkerGlobalScope.h   2021-12-03 18:00:42 UTC (rev 286499)
</span><span class="lines">@@ -87,7 +87,8 @@
</span><span class="cx"> 
</span><span class="cx">     DedicatedWorkerGlobalScope(const WorkerParameters&, Ref<SecurityOrigin>&&, DedicatedWorkerThread&, Ref<SecurityOrigin>&& topOrigin, IDBClient::IDBConnectionProxy*, SocketProvider*);
</span><span class="cx"> 
</span><del>-    bool isDedicatedWorkerGlobalScope() const final { return true; }
</del><ins>+    Type type() const final { return Type::DedicatedWorker; }
+
</ins><span class="cx">     ExceptionOr<void> importScripts(const Vector<String>& urls) final;
</span><span class="cx">     EventTargetInterface eventTargetInterface() const final;
</span><span class="cx"> 
</span><span class="lines">@@ -103,6 +104,6 @@
</span><span class="cx"> } // namespace WebCore
</span><span class="cx"> 
</span><span class="cx"> SPECIALIZE_TYPE_TRAITS_BEGIN(WebCore::DedicatedWorkerGlobalScope)
</span><del>-    static bool isType(const WebCore::ScriptExecutionContext& context) { return is<WebCore::WorkerGlobalScope>(context) && downcast<WebCore::WorkerGlobalScope>(context).isDedicatedWorkerGlobalScope(); }
-    static bool isType(const WebCore::WorkerGlobalScope& context) { return context.isDedicatedWorkerGlobalScope(); }
</del><ins>+    static bool isType(const WebCore::ScriptExecutionContext& context) { return is<WebCore::WorkerGlobalScope>(context) && downcast<WebCore::WorkerGlobalScope>(context).type() == WebCore::WorkerGlobalScope::Type::DedicatedWorker; }
+    static bool isType(const WebCore::WorkerGlobalScope& context) { return context.type() == WebCore::WorkerGlobalScope::Type::DedicatedWorker; }
</ins><span class="cx"> SPECIALIZE_TYPE_TRAITS_END()
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerGlobalScopeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerGlobalScope.h (286498 => 286499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerGlobalScope.h 2021-12-03 17:45:21 UTC (rev 286498)
+++ trunk/Source/WebCore/workers/WorkerGlobalScope.h    2021-12-03 18:00:42 UTC (rev 286499)
</span><span class="lines">@@ -76,9 +76,8 @@
</span><span class="cx"> public:
</span><span class="cx">     virtual ~WorkerGlobalScope();
</span><span class="cx"> 
</span><del>-    virtual bool isDedicatedWorkerGlobalScope() const { return false; }
-    virtual bool isSharedWorkerGlobalScope() const { return false; }
-    virtual bool isServiceWorkerGlobalScope() const { return false; }
</del><ins>+    enum class Type : uint8_t { DedicatedWorker, ServiceWorker, SharedWorker };
+    virtual Type type() const = 0;
</ins><span class="cx"> 
</span><span class="cx">     const URL& url() const final { return m_url; }
</span><span class="cx">     String origin() const;
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersserviceServiceWorkerGlobalScopeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/service/ServiceWorkerGlobalScope.h (286498 => 286499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/service/ServiceWorkerGlobalScope.h  2021-12-03 17:45:21 UTC (rev 286498)
+++ trunk/Source/WebCore/workers/service/ServiceWorkerGlobalScope.h     2021-12-03 18:00:42 UTC (rev 286499)
</span><span class="lines">@@ -50,8 +50,6 @@
</span><span class="cx"> 
</span><span class="cx">     ~ServiceWorkerGlobalScope();
</span><span class="cx"> 
</span><del>-    bool isServiceWorkerGlobalScope() const final { return true; }
-
</del><span class="cx">     ServiceWorkerClients& clients() { return m_clients.get(); }
</span><span class="cx">     ServiceWorkerRegistration& registration() { return m_registration.get(); }
</span><span class="cx">     ServiceWorker& serviceWorker() { return m_serviceWorker.get(); }
</span><span class="lines">@@ -84,6 +82,7 @@
</span><span class="cx">     ServiceWorkerGlobalScope(ServiceWorkerContextData&&, ServiceWorkerData&&, const WorkerParameters&, Ref<SecurityOrigin>&&, ServiceWorkerThread&, Ref<SecurityOrigin>&& topOrigin, IDBClient::IDBConnectionProxy*, SocketProvider*);
</span><span class="cx">     void notifyServiceWorkerPageOfCreationIfNecessary();
</span><span class="cx"> 
</span><ins>+    Type type() const final { return Type::ServiceWorker; }
</ins><span class="cx">     bool hasPendingEvents() const { return !m_extendedEvents.isEmpty(); }
</span><span class="cx"> 
</span><span class="cx">     ServiceWorkerContextData m_contextData;
</span><span class="lines">@@ -100,8 +99,8 @@
</span><span class="cx"> } // namespace WebCore
</span><span class="cx"> 
</span><span class="cx"> SPECIALIZE_TYPE_TRAITS_BEGIN(WebCore::ServiceWorkerGlobalScope)
</span><del>-    static bool isType(const WebCore::ScriptExecutionContext& context) { return is<WebCore::WorkerGlobalScope>(context) && downcast<WebCore::WorkerGlobalScope>(context).isServiceWorkerGlobalScope(); }
-    static bool isType(const WebCore::WorkerGlobalScope& context) { return context.isServiceWorkerGlobalScope(); }
</del><ins>+    static bool isType(const WebCore::ScriptExecutionContext& context) { return is<WebCore::WorkerGlobalScope>(context) && downcast<WebCore::WorkerGlobalScope>(context).type() == WebCore::WorkerGlobalScope::Type::ServiceWorker; }
+    static bool isType(const WebCore::WorkerGlobalScope& context) { return context.type() == WebCore::WorkerGlobalScope::Type::ServiceWorker; }
</ins><span class="cx"> SPECIALIZE_TYPE_TRAITS_END()
</span><span class="cx"> 
</span><span class="cx"> #endif // ENABLE(SERVICE_WORKER)
</span></span></pre></div>
<a id="trunkSourceWebCoreworkerssharedSharedWorkerGlobalScopeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/shared/SharedWorkerGlobalScope.h (286498 => 286499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/shared/SharedWorkerGlobalScope.h    2021-12-03 17:45:21 UTC (rev 286498)
+++ trunk/Source/WebCore/workers/shared/SharedWorkerGlobalScope.h       2021-12-03 18:00:42 UTC (rev 286499)
</span><span class="lines">@@ -32,10 +32,12 @@
</span><span class="cx"> class SharedWorkerGlobalScope final : public WorkerGlobalScope {
</span><span class="cx">     WTF_MAKE_ISO_ALLOCATED(SharedWorkerGlobalScope);
</span><span class="cx"> public:
</span><del>-    bool isSharedWorkerGlobalScope() const final { return true; }
</del><span class="cx">     const String& name() const;
</span><span class="cx">     void close();
</span><ins>+
</ins><span class="cx"> private:
</span><ins>+    Type type() const final { return Type::SharedWorker; }
+
</ins><span class="cx">     EventTargetInterface eventTargetInterface() const final;
</span><span class="cx">     FetchOptions::Destination destination() const final;
</span><span class="cx"> };
</span><span class="lines">@@ -43,6 +45,6 @@
</span><span class="cx"> } // namespace WebCore
</span><span class="cx"> 
</span><span class="cx"> SPECIALIZE_TYPE_TRAITS_BEGIN(WebCore::SharedWorkerGlobalScope)
</span><del>-    static bool isType(const WebCore::ScriptExecutionContext& context) { return is<WebCore::WorkerGlobalScope>(context) && downcast<WebCore::WorkerGlobalScope>(context).isSharedWorkerGlobalScope(); }
-    static bool isType(const WebCore::WorkerGlobalScope& context) { return context.isSharedWorkerGlobalScope(); }
</del><ins>+    static bool isType(const WebCore::ScriptExecutionContext& context) { return is<WebCore::WorkerGlobalScope>(context) && downcast<WebCore::WorkerGlobalScope>(context).type() == WebCore::WorkerGlobalScope::Type::SharedWorker; }
+    static bool isType(const WebCore::WorkerGlobalScope& context) { return context.type() == WebCore::WorkerGlobalScope::Type::SharedWorker; }
</ins><span class="cx"> SPECIALIZE_TYPE_TRAITS_END()
</span></span></pre>
</div>
</div>

</body>
</html>