[prev in list] [next in list] [prev in thread] [next in thread] 

List:       webkit-changes
Subject:    [webkit-changes] [239534] trunk
From:       cdumez () apple ! com
Date:       2018-12-22 3:23:08
Message-ID: 20181222032309.29E5110051CE () svn ! webkit ! org
[Download RAW message or body]

[Attachment #2 (text/html)]

<!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>[239534] trunk</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/239534">239534</a></dd> \
<dt>Author</dt> <dd>cdumez@apple.com</dd> <dt>Date</dt> <dd>2018-12-21 19:23:08 -0800 \
(Fri, 21 Dec 2018)</dd> </dl>

<h3>Log Message</h3>
<pre>navigator.userAgent in service workers does not reflect customUserAgent set by \
client https://bugs.webkit.org/show_bug.cgi?id=192951

Reviewed by Youenn Fablet.

Source/WebCore:

Whenever a service worker client registers itself, also pass its effective user \
agent. In the network process, for each origin, we store the latest client's user \
agent and use it when starting the service worker.

* dom/Document.cpp:
(WebCore::Document::setServiceWorkerConnection):
* loader/DocumentLoader.cpp:
(WebCore::DocumentLoader::registerTemporaryServiceWorkerClient):
* workers/service/SWClientConnection.h:
* workers/service/server/SWServer.cpp:
(WebCore::SWServer::serviceWorkerClientUserAgent const):
(WebCore::SWServer::installContextData):
(WebCore::SWServer::runServiceWorker):
(WebCore::SWServer::registerServiceWorkerClient):
* workers/service/server/SWServer.h:
* workers/service/server/SWServerToContextConnection.h:
* workers/service/server/SWServerWorker.cpp:
(WebCore::SWServerWorker::userAgent const):
* workers/service/server/SWServerWorker.h:

Source/WebKit:

* NetworkProcess/ServiceWorker/WebSWServerConnection.cpp:
(WebKit::WebSWServerConnection::registerServiceWorkerClient):
* NetworkProcess/ServiceWorker/WebSWServerConnection.h:
* NetworkProcess/ServiceWorker/WebSWServerConnection.messages.in:
* NetworkProcess/ServiceWorker/WebSWServerToContextConnection.cpp:
(WebKit::WebSWServerToContextConnection::installServiceWorkerContext):
* NetworkProcess/ServiceWorker/WebSWServerToContextConnection.h:
* WebProcess/Storage/WebSWClientConnection.cpp:
(WebKit::WebSWClientConnection::registerServiceWorkerClient):
* WebProcess/Storage/WebSWClientConnection.h:
* WebProcess/Storage/WebSWContextManagerConnection.cpp:
(WebKit::WebSWContextManagerConnection::installServiceWorker):
* WebProcess/Storage/WebSWContextManagerConnection.h:
* WebProcess/Storage/WebSWContextManagerConnection.messages.in:

Tools:

Extend API test coverage.

* TestWebKitAPI/Tests/WebKitCocoa/ServiceWorkerBasic.mm:
(-[SWCustomUserAgentDelegate initWithUserAgent:]):
(-[SWCustomUserAgentDelegate \
_webView:decidePolicyForNavigationAction:userInfo:decisionHandler:]): \
(-[SWUserAgentMessageHandler initWithExpectedMessage:]): (-[SWUserAgentMessageHandler \
userContentController:didReceiveScriptMessage:]):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
 <li><a href="#trunkSourceWebCoreloaderDocumentLoadercpp">trunk/Source/WebCore/loader/DocumentLoader.cpp</a></li>
 <li><a href="#trunkSourceWebCoreworkersserviceSWClientConnectionh">trunk/Source/WebCore/workers/service/SWClientConnection.h</a></li>
 <li><a href="#trunkSourceWebCoreworkersserviceserverSWServercpp">trunk/Source/WebCore/workers/service/server/SWServer.cpp</a></li>
 <li><a href="#trunkSourceWebCoreworkersserviceserverSWServerh">trunk/Source/WebCore/workers/service/server/SWServer.h</a></li>
 <li><a href="#trunkSourceWebCoreworkersserviceserverSWServerToContextConnectionh">trunk/Source/WebCore/workers/service/server/SWServerToContextConnection.h</a></li>
 <li><a href="#trunkSourceWebCoreworkersserviceserverSWServerWorkercpp">trunk/Source/WebCore/workers/service/server/SWServerWorker.cpp</a></li>
 <li><a href="#trunkSourceWebCoreworkersserviceserverSWServerWorkerh">trunk/Source/WebCore/workers/service/server/SWServerWorker.h</a></li>
 <li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitNetworkProcessServiceWorkerWebSWServerConnectioncpp">tr \
unk/Source/WebKit/NetworkProcess/ServiceWorker/WebSWServerConnection.cpp</a></li> \
<li><a href="#trunkSourceWebKitNetworkProcessServiceWorkerWebSWServerConnectionh">trunk/Source/WebKit/NetworkProcess/ServiceWorker/WebSWServerConnection.h</a></li>
 <li><a href="#trunkSourceWebKitNetworkProcessServiceWorkerWebSWServerConnectionmessag \
esin">trunk/Source/WebKit/NetworkProcess/ServiceWorker/WebSWServerConnection.messages.in</a></li>
 <li><a href="#trunkSourceWebKitNetworkProcessServiceWorkerWebSWServerToContextConnect \
ioncpp">trunk/Source/WebKit/NetworkProcess/ServiceWorker/WebSWServerToContextConnection.cpp</a></li>
 <li><a href="#trunkSourceWebKitNetworkProcessServiceWorkerWebSWServerToContextConnect \
ionh">trunk/Source/WebKit/NetworkProcess/ServiceWorker/WebSWServerToContextConnection.h</a></li>
 <li><a href="#trunkSourceWebKitWebProcessStorageWebSWClientConnectioncpp">trunk/Source/WebKit/WebProcess/Storage/WebSWClientConnection.cpp</a></li>
 <li><a href="#trunkSourceWebKitWebProcessStorageWebSWClientConnectionh">trunk/Source/WebKit/WebProcess/Storage/WebSWClientConnection.h</a></li>
 <li><a href="#trunkSourceWebKitWebProcessStorageWebSWContextManagerConnectioncpp">trunk/Source/WebKit/WebProcess/Storage/WebSWContextManagerConnection.cpp</a></li>
 <li><a href="#trunkSourceWebKitWebProcessStorageWebSWContextManagerConnectionh">trunk/Source/WebKit/WebProcess/Storage/WebSWContextManagerConnection.h</a></li>
 <li><a href="#trunkSourceWebKitWebProcessStorageWebSWContextManagerConnectionmessages \
in">trunk/Source/WebKit/WebProcess/Storage/WebSWContextManagerConnection.messages.in</a></li>
 <li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKitCocoaServiceWorkerBasicmm">trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/ServiceWorkerBasic.mm</a></li>
 </ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (239533 => \
239534)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog	2018-12-22 02:19:01 UTC (rev \
                239533)
+++ trunk/Source/WebCore/ChangeLog	2018-12-22 03:23:08 UTC (rev 239534)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2018-12-21  Chris Dumez  &lt;cdumez@apple.com&gt;
+
+        navigator.userAgent in service workers does not reflect customUserAgent set \
by client +        https://bugs.webkit.org/show_bug.cgi?id=192951
+
+        Reviewed by Youenn Fablet.
+
+        Whenever a service worker client registers itself, also pass its effective \
user agent. +        In the network process, for each origin, we store the latest \
client's user agent and +        use it when starting the service worker.
+
+        * dom/Document.cpp:
+        (WebCore::Document::setServiceWorkerConnection):
+        * loader/DocumentLoader.cpp:
+        (WebCore::DocumentLoader::registerTemporaryServiceWorkerClient):
+        * workers/service/SWClientConnection.h:
+        * workers/service/server/SWServer.cpp:
+        (WebCore::SWServer::serviceWorkerClientUserAgent const):
+        (WebCore::SWServer::installContextData):
+        (WebCore::SWServer::runServiceWorker):
+        (WebCore::SWServer::registerServiceWorkerClient):
+        * workers/service/server/SWServer.h:
+        * workers/service/server/SWServerToContextConnection.h:
+        * workers/service/server/SWServerWorker.cpp:
+        (WebCore::SWServerWorker::userAgent const):
+        * workers/service/server/SWServerWorker.h:
+
</ins><span class="cx"> 2018-12-21  Youenn Fablet  &lt;youenn@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         RTCRtpSender.setParameters() does set active \
parameter </span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (239533 => \
239534)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp	2018-12-22 02:19:01 UTC \
                (rev 239533)
+++ trunk/Source/WebCore/dom/Document.cpp	2018-12-22 03:23:08 UTC (rev 239534)
</span><span class="lines">@@ -8472,7 +8472,7 @@
</span><span class="cx">         return;
</span><span class="cx"> 
</span><span class="cx">     auto controllingServiceWorkerRegistrationIdentifier = \
activeServiceWorker() ? \
makeOptional&lt;ServiceWorkerRegistrationIdentifier&gt;(activeServiceWorker()-&gt;registrationIdentifier()) \
: WTF::nullopt; </span><del>-    \
m_serviceWorkerConnection-&gt;registerServiceWorkerClient(topOrigin(), \
ServiceWorkerClientData::from(*this, *serviceWorkerConnection), \
controllingServiceWorkerRegistrationIdentifier); </del><ins>+    \
m_serviceWorkerConnection-&gt;registerServiceWorkerClient(topOrigin(), \
ServiceWorkerClientData::from(*this, *serviceWorkerConnection), \
controllingServiceWorkerRegistrationIdentifier, userAgent(url())); </ins><span \
class="cx"> } </span><span class="cx"> #endif
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderDocumentLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/DocumentLoader.cpp \
(239533 => 239534)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/DocumentLoader.cpp	2018-12-22 \
                02:19:01 UTC (rev 239533)
+++ trunk/Source/WebCore/loader/DocumentLoader.cpp	2018-12-22 03:23:08 UTC (rev \
239534) </span><span class="lines">@@ -1791,7 +1791,7 @@
</span><span class="cx">         topOrigin = SecurityOrigin::create(url);
</span><span class="cx">     else
</span><span class="cx">         topOrigin = \
&amp;m_frame-&gt;mainFrame().document()-&gt;topOrigin(); </span><del>-    \
m_temporaryServiceWorkerClient-&gt;serviceWorkerConnection-&gt;registerServiceWorkerClient(*topOrigin, \
WTFMove(data), m_serviceWorkerRegistrationData-&gt;identifier); </del><ins>+    \
m_temporaryServiceWorkerClient-&gt;serviceWorkerConnection-&gt;registerServiceWorkerClient(*topOrigin, \
WTFMove(data), m_serviceWorkerRegistrationData-&gt;identifier, \
m_frame-&gt;loader().userAgent(url)); </ins><span class="cx"> #else
</span><span class="cx">     UNUSED_PARAM(url);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersserviceSWClientConnectionh"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebCore/workers/service/SWClientConnection.h (239533 => 239534)</h4> \
<pre class="diff"><span> <span class="info">--- \
trunk/Source/WebCore/workers/service/SWClientConnection.h	2018-12-22 02:19:01 UTC \
                (rev 239533)
+++ trunk/Source/WebCore/workers/service/SWClientConnection.h	2018-12-22 03:23:08 UTC \
(rev 239534) </span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx">     virtual bool \
mayHaveServiceWorkerRegisteredForOrigin(const SecurityOriginData&amp;) const = 0; \
</span><span class="cx">     virtual void \
syncTerminateWorker(ServiceWorkerIdentifier) = 0; </span><span class="cx"> 
</span><del>-    virtual void registerServiceWorkerClient(const SecurityOrigin&amp; \
topOrigin, const ServiceWorkerClientData&amp;, const \
Optional&lt;ServiceWorkerRegistrationIdentifier&gt;&amp;) = 0; </del><ins>+    \
virtual void registerServiceWorkerClient(const SecurityOrigin&amp; topOrigin, const \
ServiceWorkerClientData&amp;, const \
Optional&lt;ServiceWorkerRegistrationIdentifier&gt;&amp;, const String&amp; \
userAgent) = 0; </ins><span class="cx">     virtual void \
unregisterServiceWorkerClient(DocumentIdentifier) = 0; </span><span class="cx"> 
</span><span class="cx">     virtual void finishFetchingScriptInServer(const \
ServiceWorkerFetchResult&amp;) = 0; </span></span></pre></div>
<a id="trunkSourceWebCoreworkersserviceserverSWServercpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebCore/workers/service/server/SWServer.cpp (239533 => 239534)</h4> <pre \
class="diff"><span> <span class="info">--- \
trunk/Source/WebCore/workers/service/server/SWServer.cpp	2018-12-22 02:19:01 UTC (rev \
                239533)
+++ trunk/Source/WebCore/workers/service/server/SWServer.cpp	2018-12-22 03:23:08 UTC \
(rev 239534) </span><span class="lines">@@ -92,6 +92,14 @@
</span><span class="cx">     return clientIterator-&gt;value;
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+String SWServer::serviceWorkerClientUserAgent(const ClientOrigin&amp; \
clientOrigin) const +{
+    auto iterator = m_clientIdentifiersPerOrigin.find(clientOrigin);
+    if (iterator == m_clientIdentifiersPerOrigin.end())
+        return String();
+    return iterator-&gt;value.userAgent;
+}
+
</ins><span class="cx"> SWServerWorker* \
SWServer::activeWorkerFromRegistrationID(ServiceWorkerRegistrationIdentifier \
identifier) </span><span class="cx"> {
</span><span class="cx">     auto* registration = \
m_registrationsByID.get(identifier); </span><span class="lines">@@ -548,10 +556,11 @@
</span><span class="cx"> 
</span><span class="cx">     registration-&gt;setPreInstallationWorker(worker.ptr());
</span><span class="cx">     worker-&gt;setState(SWServerWorker::State::Running);
</span><ins>+    auto userAgent = worker-&gt;userAgent();
</ins><span class="cx">     auto result = \
m_runningOrTerminatingWorkers.add(data.serviceWorkerIdentifier, WTFMove(worker)); \
</span><span class="cx">     ASSERT_UNUSED(result, result.isNewEntry); </span><span \
class="cx">  </span><del>-    connection-&gt;installServiceWorkerContext(data, \
m_sessionID); </del><ins>+    connection-&gt;installServiceWorkerContext(data, \
m_sessionID, userAgent); </ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void \
SWServer::runServiceWorkerIfNecessary(ServiceWorkerIdentifier identifier, \
RunServiceWorkerCallback&amp;&amp; callback) </span><span class="lines">@@ -602,7 \
+611,7 @@ </span><span class="cx">     auto* contextConnection = \
worker-&gt;contextConnection(); </span><span class="cx">     \
ASSERT(contextConnection); </span><span class="cx"> 
</span><del>-    contextConnection-&gt;installServiceWorkerContext(worker-&gt;contextData(), \
m_sessionID); </del><ins>+    \
contextConnection-&gt;installServiceWorkerContext(worker-&gt;contextData(), \
m_sessionID, worker-&gt;userAgent()); </ins><span class="cx"> 
</span><span class="cx">     return true;
</span><span class="cx"> }
</span><span class="lines">@@ -731,7 +740,7 @@
</span><span class="cx">     return \
m_registrations.get(iterator-&gt;value-&gt;registrationKey()); </span><span \
class="cx"> } </span><span class="cx"> 
</span><del>-void SWServer::registerServiceWorkerClient(ClientOrigin&amp;&amp; \
clientOrigin, ServiceWorkerClientData&amp;&amp; data, const \
Optional&lt;ServiceWorkerRegistrationIdentifier&gt;&amp; \
controllingServiceWorkerRegistrationIdentifier) </del><ins>+void \
SWServer::registerServiceWorkerClient(ClientOrigin&amp;&amp; clientOrigin, \
ServiceWorkerClientData&amp;&amp; data, const \
Optional&lt;ServiceWorkerRegistrationIdentifier&gt;&amp; \
controllingServiceWorkerRegistrationIdentifier, String&amp;&amp; userAgent) \
</ins><span class="cx"> { </span><span class="cx">     auto clientIdentifier = \
data.identifier; </span><span class="cx"> 
</span><span class="lines">@@ -744,6 +753,11 @@
</span><span class="cx"> 
</span><span class="cx">     \
ASSERT(!clientIdentifiersForOrigin.identifiers.contains(clientIdentifier)); \
</span><span class="cx">     \
clientIdentifiersForOrigin.identifiers.append(clientIdentifier); </span><ins>+
+    if (!clientIdentifiersForOrigin.userAgent.isNull() &amp;&amp; \
clientIdentifiersForOrigin.userAgent != userAgent) +        \
RELEASE_LOG_ERROR(ServiceWorker, &quot;%p - SWServer::registerServiceWorkerClient: \
Service worker has clients using different user agents&quot;, this); +    \
clientIdentifiersForOrigin.userAgent = WTFMove(userAgent); +
</ins><span class="cx">     clientIdentifiersForOrigin.terminateServiceWorkersTimer = \
nullptr; </span><span class="cx"> 
</span><span class="cx">     \
m_clientsBySecurityOrigin.ensure(clientOrigin.clientOrigin, [] { \
</span></span></pre></div> <a \
id="trunkSourceWebCoreworkersserviceserverSWServerh"></a> <div \
class="modfile"><h4>Modified: trunk/Source/WebCore/workers/service/server/SWServer.h \
(239533 => 239534)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/Source/WebCore/workers/service/server/SWServer.h	2018-12-22 02:19:01 UTC (rev \
                239533)
+++ trunk/Source/WebCore/workers/service/server/SWServer.h	2018-12-22 03:23:08 UTC \
(rev 239534) </span><span class="lines">@@ -141,6 +141,7 @@
</span><span class="cx"> 
</span><span class="cx">     WEBCORE_EXPORT SWServerWorker* \
workerByID(ServiceWorkerIdentifier) const; </span><span class="cx">     \
Optional&lt;ServiceWorkerClientData&gt; serviceWorkerClientWithOriginByID(const \
ClientOrigin&amp;, const ServiceWorkerClientIdentifier&amp;) const; </span><ins>+    \
String serviceWorkerClientUserAgent(const ClientOrigin&amp;) const; </ins><span \
class="cx">     WEBCORE_EXPORT SWServerWorker* \
activeWorkerFromRegistrationID(ServiceWorkerRegistrationIdentifier); </span><span \
class="cx">  </span><span class="cx">     WEBCORE_EXPORT void \
markAllWorkersForOriginAsTerminated(const SecurityOriginData&amp;); </span><span \
class="lines">@@ -163,7 +164,7 @@ </span><span class="cx">     
</span><span class="cx">     WEBCORE_EXPORT static HashSet&lt;SWServer*&gt;&amp; \
allServers(); </span><span class="cx"> 
</span><del>-    WEBCORE_EXPORT void \
registerServiceWorkerClient(ClientOrigin&amp;&amp;, \
ServiceWorkerClientData&amp;&amp;, const \
Optional&lt;ServiceWorkerRegistrationIdentifier&gt;&amp;); </del><ins>+    \
WEBCORE_EXPORT void registerServiceWorkerClient(ClientOrigin&amp;&amp;, \
ServiceWorkerClientData&amp;&amp;, const \
Optional&lt;ServiceWorkerRegistrationIdentifier&gt;&amp;, String&amp;&amp; \
userAgent); </ins><span class="cx">     WEBCORE_EXPORT void \
unregisterServiceWorkerClient(const ClientOrigin&amp;, \
ServiceWorkerClientIdentifier); </span><span class="cx"> 
</span><span class="cx">     using RunServiceWorkerCallback = \
WTF::Function&lt;void(SWServerToContextConnection*)&gt;; </span><span \
class="lines">@@ -220,6 +221,7 @@ </span><span class="cx">     struct Clients {
</span><span class="cx">         Vector&lt;ServiceWorkerClientIdentifier&gt; \
identifiers; </span><span class="cx">         std::unique_ptr&lt;Timer&gt; \
terminateServiceWorkersTimer; </span><ins>+        String userAgent;
</ins><span class="cx">     };
</span><span class="cx">     HashMap&lt;ClientOrigin, Clients&gt; \
m_clientIdentifiersPerOrigin; </span><span class="cx">     \
HashMap&lt;ServiceWorkerClientIdentifier, ServiceWorkerClientData&gt; m_clientsById; \
</span></span></pre></div> <a \
id="trunkSourceWebCoreworkersserviceserverSWServerToContextConnectionh"></a> <div \
class="modfile"><h4>Modified: \
trunk/Source/WebCore/workers/service/server/SWServerToContextConnection.h (239533 => \
239534)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/Source/WebCore/workers/service/server/SWServerToContextConnection.h	2018-12-22 \
                02:19:01 UTC (rev 239533)
+++ trunk/Source/WebCore/workers/service/server/SWServerToContextConnection.h	2018-12-22 \
03:23:08 UTC (rev 239534) </span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx">     SWServerToContextConnectionIdentifier identifier() const \
{ return m_identifier; } </span><span class="cx"> 
</span><span class="cx">     // Messages to the SW host process
</span><del>-    virtual void installServiceWorkerContext(const \
ServiceWorkerContextData&amp;, PAL::SessionID) = 0; </del><ins>+    virtual void \
installServiceWorkerContext(const ServiceWorkerContextData&amp;, PAL::SessionID, \
const String&amp; userAgent) = 0; </ins><span class="cx">     virtual void \
fireInstallEvent(ServiceWorkerIdentifier) = 0; </span><span class="cx">     virtual \
void fireActivateEvent(ServiceWorkerIdentifier) = 0; </span><span class="cx">     \
virtual void terminateWorker(ServiceWorkerIdentifier) = 0; </span></span></pre></div>
<a id="trunkSourceWebCoreworkersserviceserverSWServerWorkercpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebCore/workers/service/server/SWServerWorker.cpp (239533 => \
239534)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/Source/WebCore/workers/service/server/SWServerWorker.cpp	2018-12-22 02:19:01 \
                UTC (rev 239533)
+++ trunk/Source/WebCore/workers/service/server/SWServerWorker.cpp	2018-12-22 \
03:23:08 UTC (rev 239534) </span><span class="lines">@@ -136,6 +136,11 @@
</span><span class="cx">     return m_server.matchAll(*this, options, \
WTFMove(callback)); </span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+String SWServerWorker::userAgent() const
+{
+    return m_server.serviceWorkerClientUserAgent(origin());
+}
+
</ins><span class="cx"> void SWServerWorker::claim()
</span><span class="cx"> {
</span><span class="cx">     return m_server.claim(*this);
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersserviceserverSWServerWorkerh"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebCore/workers/service/server/SWServerWorker.h (239533 => 239534)</h4> \
<pre class="diff"><span> <span class="info">--- \
trunk/Source/WebCore/workers/service/server/SWServerWorker.h	2018-12-22 02:19:01 UTC \
                (rev 239533)
+++ trunk/Source/WebCore/workers/service/server/SWServerWorker.h	2018-12-22 03:23:08 \
UTC (rev 239534) </span><span class="lines">@@ -109,9 +109,10 @@
</span><span class="cx">     WEBCORE_EXPORT const SecurityOriginData&amp; \
securityOrigin() const; </span><span class="cx"> 
</span><span class="cx">     WEBCORE_EXPORT SWServerToContextConnection* \
contextConnection(); </span><ins>+    String userAgent() const;
</ins><span class="cx"> 
</span><span class="cx"> private:
</span><del>-    SWServerWorker(SWServer&amp;, SWServerRegistration&amp;, const \
URL&amp;, const String&amp; script, const ContentSecurityPolicyResponseHeaders&amp;,  \
WorkerType, ServiceWorkerIdentifier, HashMap&lt;URL, \
ServiceWorkerContextData::ImportedScript&gt;&amp;&amp;); </del><ins>+    \
SWServerWorker(SWServer&amp;, SWServerRegistration&amp;, const URL&amp;, const \
String&amp; script, const ContentSecurityPolicyResponseHeaders&amp;, WorkerType, \
ServiceWorkerIdentifier, HashMap&lt;URL, \
ServiceWorkerContextData::ImportedScript&gt;&amp;&amp;); </ins><span class="cx"> 
</span><span class="cx">     void callWhenActivatedHandler(bool success);
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (239533 => \
239534)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog	2018-12-22 02:19:01 UTC (rev \
                239533)
+++ trunk/Source/WebKit/ChangeLog	2018-12-22 03:23:08 UTC (rev 239534)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2018-12-21  Chris Dumez  &lt;cdumez@apple.com&gt;
+
+        navigator.userAgent in service workers does not reflect customUserAgent set \
by client +        https://bugs.webkit.org/show_bug.cgi?id=192951
+
+        Reviewed by Youenn Fablet.
+
+        * NetworkProcess/ServiceWorker/WebSWServerConnection.cpp:
+        (WebKit::WebSWServerConnection::registerServiceWorkerClient):
+        * NetworkProcess/ServiceWorker/WebSWServerConnection.h:
+        * NetworkProcess/ServiceWorker/WebSWServerConnection.messages.in:
+        * NetworkProcess/ServiceWorker/WebSWServerToContextConnection.cpp:
+        (WebKit::WebSWServerToContextConnection::installServiceWorkerContext):
+        * NetworkProcess/ServiceWorker/WebSWServerToContextConnection.h:
+        * WebProcess/Storage/WebSWClientConnection.cpp:
+        (WebKit::WebSWClientConnection::registerServiceWorkerClient):
+        * WebProcess/Storage/WebSWClientConnection.h:
+        * WebProcess/Storage/WebSWContextManagerConnection.cpp:
+        (WebKit::WebSWContextManagerConnection::installServiceWorker):
+        * WebProcess/Storage/WebSWContextManagerConnection.h:
+        * WebProcess/Storage/WebSWContextManagerConnection.messages.in:
+
</ins><span class="cx"> 2018-12-21  Alex Christensen  &lt;achristensen@webkit.org&gt;
</span><span class="cx"> 
</span><span class="cx">         Expand use of sourceApplicationAuditData
</span></span></pre></div>
<a id="trunkSourceWebKitNetworkProcessServiceWorkerWebSWServerConnectioncpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebKit/NetworkProcess/ServiceWorker/WebSWServerConnection.cpp (239533 => \
239534)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/Source/WebKit/NetworkProcess/ServiceWorker/WebSWServerConnection.cpp	2018-12-22 \
                02:19:01 UTC (rev 239533)
+++ trunk/Source/WebKit/NetworkProcess/ServiceWorker/WebSWServerConnection.cpp	2018-12-22 \
03:23:08 UTC (rev 239534) </span><span class="lines">@@ -291,11 +291,11 @@
</span><span class="cx">     \
send(Messages::WebSWClientConnection::DidGetRegistrations { \
registrationMatchRequestIdentifier, registrations }); </span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void WebSWServerConnection::registerServiceWorkerClient(SecurityOriginData&amp;&amp; \
topOrigin, ServiceWorkerClientData&amp;&amp; data, const \
Optional&lt;ServiceWorkerRegistrationIdentifier&gt;&amp; \
controllingServiceWorkerRegistrationIdentifier) </del><ins>+void \
WebSWServerConnection::registerServiceWorkerClient(SecurityOriginData&amp;&amp; \
topOrigin, ServiceWorkerClientData&amp;&amp; data, const \
Optional&lt;ServiceWorkerRegistrationIdentifier&gt;&amp; \
controllingServiceWorkerRegistrationIdentifier, String&amp;&amp; userAgent) \
</ins><span class="cx"> { </span><span class="cx">     auto clientOrigin = \
ClientOrigin { WTFMove(topOrigin), SecurityOriginData::fromURL(data.url) }; \
</span><span class="cx">     m_clientOrigins.add(data.identifier, clientOrigin); \
</span><del>-    server().registerServiceWorkerClient(WTFMove(clientOrigin), \
WTFMove(data), controllingServiceWorkerRegistrationIdentifier); </del><ins>+    \
server().registerServiceWorkerClient(WTFMove(clientOrigin), WTFMove(data), \
controllingServiceWorkerRegistrationIdentifier, WTFMove(userAgent)); </ins><span \
class="cx"> } </span><span class="cx"> 
</span><span class="cx"> void \
WebSWServerConnection::unregisterServiceWorkerClient(const \
ServiceWorkerClientIdentifier&amp; clientIdentifier) </span></span></pre></div>
<a id="trunkSourceWebKitNetworkProcessServiceWorkerWebSWServerConnectionh"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebKit/NetworkProcess/ServiceWorker/WebSWServerConnection.h (239533 => \
239534)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/Source/WebKit/NetworkProcess/ServiceWorker/WebSWServerConnection.h	2018-12-22 \
                02:19:01 UTC (rev 239533)
+++ trunk/Source/WebKit/NetworkProcess/ServiceWorker/WebSWServerConnection.h	2018-12-22 \
03:23:08 UTC (rev 239534) </span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx">     void matchRegistration(uint64_t \
registrationMatchRequestIdentifier, const WebCore::SecurityOriginData&amp; topOrigin, \
const URL&amp; clientURL); </span><span class="cx">     void \
getRegistrations(uint64_t registrationMatchRequestIdentifier, const \
WebCore::SecurityOriginData&amp; topOrigin, const URL&amp; clientURL); </span><span \
class="cx">  </span><del>-    void \
registerServiceWorkerClient(WebCore::SecurityOriginData&amp;&amp; topOrigin, \
WebCore::ServiceWorkerClientData&amp;&amp;, const \
Optional&lt;WebCore::ServiceWorkerRegistrationIdentifier&gt;&amp;); </del><ins>+    \
void registerServiceWorkerClient(WebCore::SecurityOriginData&amp;&amp; topOrigin, \
WebCore::ServiceWorkerClientData&amp;&amp;, const \
Optional&lt;WebCore::ServiceWorkerRegistrationIdentifier&gt;&amp;, String&amp;&amp; \
userAgent); </ins><span class="cx">     void unregisterServiceWorkerClient(const \
WebCore::ServiceWorkerClientIdentifier&amp;); </span><span class="cx"> 
</span><span class="cx">     IPC::Connection* messageSenderConnection() final { \
return m_contentConnection.ptr(); } </span></span></pre></div>
<a id="trunkSourceWebKitNetworkProcessServiceWorkerWebSWServerConnectionmessagesin"></a>
 <div class="modfile"><h4>Modified: \
trunk/Source/WebKit/NetworkProcess/ServiceWorker/WebSWServerConnection.messages.in \
(239533 => 239534)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/Source/WebKit/NetworkProcess/ServiceWorker/WebSWServerConnection.messages.in	2018-12-22 \
                02:19:01 UTC (rev 239533)
+++ trunk/Source/WebKit/NetworkProcess/ServiceWorker/WebSWServerConnection.messages.in	2018-12-22 \
03:23:08 UTC (rev 239534) </span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx">     MatchRegistration(uint64_t \
serviceRegistrationMatchRequestIdentifier, struct WebCore::SecurityOriginData \
topOrigin, URL clientURL) </span><span class="cx">     WhenRegistrationReady(uint64_t \
serviceRegistrationMatchRequestIdentifier, struct WebCore::SecurityOriginData \
topOrigin, URL clientURL) </span><span class="cx">     GetRegistrations(uint64_t \
serviceRegistrationMatchRequestIdentifier, struct WebCore::SecurityOriginData \
topOrigin, URL clientURL) </span><del>-    RegisterServiceWorkerClient(struct \
WebCore::SecurityOriginData topOrigin, struct WebCore::ServiceWorkerClientData data, \
Optional&lt;WebCore::ServiceWorkerRegistrationIdentifier&gt; \
controllingServiceWorkerRegistrationIdentifier) </del><ins>+    \
RegisterServiceWorkerClient(struct WebCore::SecurityOriginData topOrigin, struct \
WebCore::ServiceWorkerClientData data, \
Optional&lt;WebCore::ServiceWorkerRegistrationIdentifier&gt; \
controllingServiceWorkerRegistrationIdentifier, String userAgent) </ins><span \
class="cx">     UnregisterServiceWorkerClient(struct \
WebCore::ServiceWorkerClientIdentifier identifier) </span><span class="cx"> 
</span><span class="cx">     SyncTerminateWorker(WebCore::ServiceWorkerIdentifier \
workerIdentifier) -&gt; () LegacySync </span></span></pre></div>
<a id="trunkSourceWebKitNetworkProcessServiceWorkerWebSWServerToContextConnectioncpp"></a>
 <div class="modfile"><h4>Modified: \
trunk/Source/WebKit/NetworkProcess/ServiceWorker/WebSWServerToContextConnection.cpp \
(239533 => 239534)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/Source/WebKit/NetworkProcess/ServiceWorker/WebSWServerToContextConnection.cpp	2018-12-22 \
                02:19:01 UTC (rev 239533)
+++ trunk/Source/WebKit/NetworkProcess/ServiceWorker/WebSWServerToContextConnection.cpp	2018-12-22 \
03:23:08 UTC (rev 239534) </span><span class="lines">@@ -57,9 +57,9 @@
</span><span class="cx">     // FIXME: Do what here...?
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void WebSWServerToContextConnection::installServiceWorkerContext(const \
ServiceWorkerContextData&amp; data, PAL::SessionID sessionID) </del><ins>+void \
WebSWServerToContextConnection::installServiceWorkerContext(const \
ServiceWorkerContextData&amp; data, PAL::SessionID sessionID, const String&amp; \
userAgent) </ins><span class="cx"> {
</span><del>-    send(Messages::WebSWContextManagerConnection::InstallServiceWorker { \
data, sessionID }); </del><ins>+    \
send(Messages::WebSWContextManagerConnection::InstallServiceWorker { data, sessionID, \
userAgent }); </ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void \
WebSWServerToContextConnection::fireInstallEvent(ServiceWorkerIdentifier \
serviceWorkerIdentifier) </span></span></pre></div>
<a id="trunkSourceWebKitNetworkProcessServiceWorkerWebSWServerToContextConnectionh"></a>
 <div class="modfile"><h4>Modified: \
trunk/Source/WebKit/NetworkProcess/ServiceWorker/WebSWServerToContextConnection.h \
(239533 => 239534)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/Source/WebKit/NetworkProcess/ServiceWorker/WebSWServerToContextConnection.h	2018-12-22 \
                02:19:01 UTC (rev 239533)
+++ trunk/Source/WebKit/NetworkProcess/ServiceWorker/WebSWServerToContextConnection.h	2018-12-22 \
03:23:08 UTC (rev 239534) </span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx">     uint64_t messageSenderDestinationID() final;
</span><span class="cx"> 
</span><span class="cx">     // Messages to the SW host WebProcess
</span><del>-    void installServiceWorkerContext(const \
WebCore::ServiceWorkerContextData&amp;, PAL::SessionID) final; </del><ins>+    void \
installServiceWorkerContext(const WebCore::ServiceWorkerContextData&amp;, \
PAL::SessionID, const String&amp; userAgent) final; </ins><span class="cx">     void \
fireInstallEvent(WebCore::ServiceWorkerIdentifier) final; </span><span class="cx">    \
void fireActivateEvent(WebCore::ServiceWorkerIdentifier) final; </span><span \
class="cx">     void terminateWorker(WebCore::ServiceWorkerIdentifier) final; \
</span></span></pre></div> <a \
id="trunkSourceWebKitWebProcessStorageWebSWClientConnectioncpp"></a> <div \
class="modfile"><h4>Modified: \
trunk/Source/WebKit/WebProcess/Storage/WebSWClientConnection.cpp (239533 => \
239534)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/Source/WebKit/WebProcess/Storage/WebSWClientConnection.cpp	2018-12-22 02:19:01 \
                UTC (rev 239533)
+++ trunk/Source/WebKit/WebProcess/Storage/WebSWClientConnection.cpp	2018-12-22 \
03:23:08 UTC (rev 239534) </span><span class="lines">@@ -93,9 +93,9 @@
</span><span class="cx">     \
WebProcess::singleton().send(Messages::WebProcessPool::PostMessageToServiceWorker(destinationIdentifier, \
WTFMove(message), sourceIdentifier, serverConnectionIdentifier()), 0); </span><span \
class="cx"> } </span><span class="cx"> 
</span><del>-void WebSWClientConnection::registerServiceWorkerClient(const \
SecurityOrigin&amp; topOrigin, const WebCore::ServiceWorkerClientData&amp; data, \
const Optional&lt;WebCore::ServiceWorkerRegistrationIdentifier&gt;&amp; \
controllingServiceWorkerRegistrationIdentifier) </del><ins>+void \
WebSWClientConnection::registerServiceWorkerClient(const SecurityOrigin&amp; \
topOrigin, const WebCore::ServiceWorkerClientData&amp; data, const \
Optional&lt;WebCore::ServiceWorkerRegistrationIdentifier&gt;&amp; \
controllingServiceWorkerRegistrationIdentifier, const String&amp; userAgent) \
</ins><span class="cx"> { </span><del>-    \
send(Messages::WebSWServerConnection::RegisterServiceWorkerClient { topOrigin.data(), \
data, controllingServiceWorkerRegistrationIdentifier }); </del><ins>+    \
send(Messages::WebSWServerConnection::RegisterServiceWorkerClient { topOrigin.data(), \
data, controllingServiceWorkerRegistrationIdentifier, userAgent }); </ins><span \
class="cx"> } </span><span class="cx"> 
</span><span class="cx"> void \
WebSWClientConnection::unregisterServiceWorkerClient(DocumentIdentifier \
contextIdentifier) </span></span></pre></div>
<a id="trunkSourceWebKitWebProcessStorageWebSWClientConnectionh"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebKit/WebProcess/Storage/WebSWClientConnection.h (239533 => \
239534)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/Source/WebKit/WebProcess/Storage/WebSWClientConnection.h	2018-12-22 02:19:01 \
                UTC (rev 239533)
+++ trunk/Source/WebKit/WebProcess/Storage/WebSWClientConnection.h	2018-12-22 \
03:23:08 UTC (rev 239534) </span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx">     void scheduleJobInServer(const \
WebCore::ServiceWorkerJobData&amp;) final; </span><span class="cx">     void \
finishFetchingScriptInServer(const WebCore::ServiceWorkerFetchResult&amp;) final; \
</span><span class="cx">     void \
postMessageToServiceWorker(WebCore::ServiceWorkerIdentifier destinationIdentifier, \
WebCore::MessageWithMessagePorts&amp;&amp;, const \
WebCore::ServiceWorkerOrClientIdentifier&amp; source) final; </span><del>-    void \
registerServiceWorkerClient(const WebCore::SecurityOrigin&amp; topOrigin, const \
WebCore::ServiceWorkerClientData&amp;, const \
Optional&lt;WebCore::ServiceWorkerRegistrationIdentifier&gt;&amp;) final; \
</del><ins>+    void registerServiceWorkerClient(const WebCore::SecurityOrigin&amp; \
topOrigin, const WebCore::ServiceWorkerClientData&amp;, const \
Optional&lt;WebCore::ServiceWorkerRegistrationIdentifier&gt;&amp;, const String&amp; \
userAgent) final; </ins><span class="cx">     void \
unregisterServiceWorkerClient(WebCore::DocumentIdentifier) final; </span><span \
class="cx">  </span><span class="cx">     void \
matchRegistration(WebCore::SecurityOriginData&amp;&amp; topOrigin, const URL&amp; \
clientURL, RegistrationCallback&amp;&amp;) final; </span></span></pre></div>
<a id="trunkSourceWebKitWebProcessStorageWebSWContextManagerConnectioncpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebKit/WebProcess/Storage/WebSWContextManagerConnection.cpp (239533 => \
239534)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/Source/WebKit/WebProcess/Storage/WebSWContextManagerConnection.cpp	2018-12-22 \
                02:19:01 UTC (rev 239533)
+++ trunk/Source/WebKit/WebProcess/Storage/WebSWContextManagerConnection.cpp	2018-12-22 \
03:23:08 UTC (rev 239534) </span><span class="lines">@@ -135,7 +135,7 @@
</span><span class="cx">     m_storageBlockingPolicy = \
static_cast&lt;SecurityOrigin::StorageBlockingPolicy&gt;(store.getUInt32ValueForKey(WebPreferencesKey::storageBlockingPolicyKey()));
 </span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void WebSWContextManagerConnection::installServiceWorker(const \
ServiceWorkerContextData&amp; data, SessionID sessionID) </del><ins>+void \
WebSWContextManagerConnection::installServiceWorker(const \
ServiceWorkerContextData&amp; data, SessionID sessionID, String&amp;&amp; userAgent) \
</ins><span class="cx"> { </span><span class="cx">     LOG(ServiceWorker, \
&quot;WebSWContextManagerConnection::installServiceWorker for worker %s&quot;, \
data.serviceWorkerIdentifier.loggingString().utf8().data()); </span><span class="cx"> \
 </span><span class="lines">@@ -145,13 +145,17 @@
</span><span class="cx">     pageConfiguration.databaseProvider = \
WebDatabaseProvider::getOrCreate(m_pageGroupID); </span><span class="cx"> #endif
</span><span class="cx"> 
</span><ins>+    auto effectiveUserAgent =  WTFMove(userAgent);
+    if (effectiveUserAgent.isNull())
+        effectiveUserAgent = m_userAgent;
+
</ins><span class="cx">     // FIXME: This method should be moved directly to \
WebCore::SWContextManager::Connection </span><span class="cx">     // If it weren't \
for ServiceWorkerFrameLoaderClient's dependence on WebDocumentLoader, this could \
already happen. </span><del>-    auto frameLoaderClient = \
std::make_unique&lt;ServiceWorkerFrameLoaderClient&gt;(*this, sessionID, m_pageID, \
++m_previousServiceWorkerID, m_userAgent); </del><ins>+    auto frameLoaderClient = \
std::make_unique&lt;ServiceWorkerFrameLoaderClient&gt;(*this, sessionID, m_pageID, \
++m_previousServiceWorkerID, effectiveUserAgent); </ins><span class="cx">     \
pageConfiguration.loaderClientForMainFrame = frameLoaderClient.get(); </span><span \
class="cx">     m_loaders.add(WTFMove(frameLoaderClient)); </span><span class="cx"> 
</span><del>-    auto serviceWorkerThreadProxy = \
ServiceWorkerThreadProxy::create(WTFMove(pageConfiguration), data, sessionID, String \
{ m_userAgent }, WebProcess::singleton().cacheStorageProvider(), \
m_storageBlockingPolicy); </del><ins>+    auto serviceWorkerThreadProxy = \
ServiceWorkerThreadProxy::create(WTFMove(pageConfiguration), data, sessionID, \
WTFMove(effectiveUserAgent), WebProcess::singleton().cacheStorageProvider(), \
m_storageBlockingPolicy); </ins><span class="cx">     \
SWContextManager::singleton().registerServiceWorkerThreadForInstall(WTFMove(serviceWorkerThreadProxy));
 </span><span class="cx"> 
</span><span class="cx">     LOG(ServiceWorker, &quot;Context process PID: %i created \
worker thread\n&quot;, getCurrentProcessID()); </span></span></pre></div>
<a id="trunkSourceWebKitWebProcessStorageWebSWContextManagerConnectionh"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebKit/WebProcess/Storage/WebSWContextManagerConnection.h (239533 => \
239534)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/Source/WebKit/WebProcess/Storage/WebSWContextManagerConnection.h	2018-12-22 \
                02:19:01 UTC (rev 239533)
+++ trunk/Source/WebKit/WebProcess/Storage/WebSWContextManagerConnection.h	2018-12-22 \
03:23:08 UTC (rev 239534) </span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx"> 
</span><span class="cx">     // IPC messages.
</span><span class="cx">     void \
serviceWorkerStartedWithMessage(Optional&lt;WebCore::ServiceWorkerJobDataIdentifier&gt;, \
WebCore::ServiceWorkerIdentifier, const String&amp; exceptionMessage) final; \
</span><del>-    void installServiceWorker(const \
WebCore::ServiceWorkerContextData&amp;, PAL::SessionID); </del><ins>+    void \
installServiceWorker(const WebCore::ServiceWorkerContextData&amp;, PAL::SessionID, \
String&amp;&amp; userAgent); </ins><span class="cx">     void \
startFetch(WebCore::SWServerConnectionIdentifier, WebCore::ServiceWorkerIdentifier, \
WebCore::FetchIdentifier, WebCore::ResourceRequest&amp;&amp;, \
WebCore::FetchOptions&amp;&amp;, IPC::FormDataReference&amp;&amp;, String&amp;&amp; \
referrer); </span><span class="cx">     void \
cancelFetch(WebCore::SWServerConnectionIdentifier, WebCore::ServiceWorkerIdentifier, \
WebCore::FetchIdentifier); </span><span class="cx">     void \
postMessageToServiceWorker(WebCore::ServiceWorkerIdentifier destinationIdentifier, \
WebCore::MessageWithMessagePorts&amp;&amp;, \
WebCore::ServiceWorkerOrClientData&amp;&amp; sourceData); </span></span></pre></div>
<a id="trunkSourceWebKitWebProcessStorageWebSWContextManagerConnectionmessagesin"></a>
 <div class="modfile"><h4>Modified: \
trunk/Source/WebKit/WebProcess/Storage/WebSWContextManagerConnection.messages.in \
(239533 => 239534)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/Source/WebKit/WebProcess/Storage/WebSWContextManagerConnection.messages.in	2018-12-22 \
                02:19:01 UTC (rev 239533)
+++ trunk/Source/WebKit/WebProcess/Storage/WebSWContextManagerConnection.messages.in	2018-12-22 \
03:23:08 UTC (rev 239534) </span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> #if ENABLE(SERVICE_WORKER)
</span><span class="cx"> 
</span><span class="cx"> messages -&gt; WebSWContextManagerConnection {
</span><del>-    InstallServiceWorker(struct WebCore::ServiceWorkerContextData \
contextData, PAL::SessionID sessionID) </del><ins>+    InstallServiceWorker(struct \
WebCore::ServiceWorkerContextData contextData, PAL::SessionID sessionID, String \
userAgent) </ins><span class="cx">     \
StartFetch(WebCore::SWServerConnectionIdentifier serverConnectionIdentifier, \
WebCore::ServiceWorkerIdentifier serviceWorkerIdentifier, WebCore::FetchIdentifier \
fetchIdentifier, WebCore::ResourceRequest request, struct WebCore::FetchOptions \
options, IPC::FormDataReference requestBody, String referrer) </span><span \
class="cx">     CancelFetch(WebCore::SWServerConnectionIdentifier \
serverConnectionIdentifier, WebCore::ServiceWorkerIdentifier serviceWorkerIdentifier, \
WebCore::FetchIdentifier fetchIdentifier) </span><span class="cx">     \
PostMessageToServiceWorker(WebCore::ServiceWorkerIdentifier destinationIdentifier, \
struct WebCore::MessageWithMessagePorts message, WebCore::ServiceWorkerOrClientData \
sourceData) </span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (239533 => 239534)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog	2018-12-22 02:19:01 UTC (rev 239533)
+++ trunk/Tools/ChangeLog	2018-12-22 03:23:08 UTC (rev 239534)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2018-12-21  Chris Dumez  &lt;cdumez@apple.com&gt;
+
+        navigator.userAgent in service workers does not reflect customUserAgent set \
by client +        https://bugs.webkit.org/show_bug.cgi?id=192951
+
+        Reviewed by Youenn Fablet.
+
+        Extend API test coverage.
+
+        * TestWebKitAPI/Tests/WebKitCocoa/ServiceWorkerBasic.mm:
+        (-[SWCustomUserAgentDelegate initWithUserAgent:]):
+        (-[SWCustomUserAgentDelegate \
_webView:decidePolicyForNavigationAction:userInfo:decisionHandler:]): +        \
(-[SWUserAgentMessageHandler initWithExpectedMessage:]): +        \
(-[SWUserAgentMessageHandler userContentController:didReceiveScriptMessage:]): +
</ins><span class="cx"> 2018-12-21  Jiewen Tan  &lt;jiewen_tan@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [WebAuthN] userPresence should always be true
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKitCocoaServiceWorkerBasicmm"></a>
<div class="modfile"><h4>Modified: \
trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/ServiceWorkerBasic.mm (239533 => \
239534)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/ServiceWorkerBasic.mm	2018-12-22 02:19:01 \
                UTC (rev 239533)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/ServiceWorkerBasic.mm	2018-12-22 \
03:23:08 UTC (rev 239534) </span><span class="lines">@@ -514,16 +514,25 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> @interface SWCustomUserAgentDelegate : NSObject \
&lt;WKNavigationDelegate&gt; { </span><ins>+    NSString *_userAgent;
</ins><span class="cx"> }
</span><ins>+- (instancetype)initWithUserAgent:(NSString *)userAgent;
</ins><span class="cx"> @end
</span><span class="cx"> 
</span><span class="cx"> @implementation SWCustomUserAgentDelegate
</span><span class="cx"> 
</span><ins>+- (instancetype)initWithUserAgent:(NSString *)userAgent
+{
+    self = [super init];
+    _userAgent = userAgent;
+    return self;
+}
+
</ins><span class="cx"> - (void)_webView:(WKWebView *)webView \
decidePolicyForNavigationAction:(WKNavigationAction *)navigationAction userInfo:(id \
&lt;NSSecureCoding&gt;)userInfo decisionHandler:(void (^)(WKNavigationActionPolicy, \
_WKWebsitePolicies *))decisionHandler </span><span class="cx"> {
</span><span class="cx">     _WKWebsitePolicies *websitePolicies = \
[[[_WKWebsitePolicies alloc] init] autorelease]; </span><span class="cx">     if \
(navigationAction.targetFrame.mainFrame) </span><del>-        [websitePolicies \
setCustomUserAgent:@&quot;Foo Custom UserAgent&quot;]; </del><ins>+        \
[websitePolicies setCustomUserAgent:_userAgent]; </ins><span class="cx"> 
</span><span class="cx">     decisionHandler(WKNavigationActionPolicyAllow, \
websitePolicies); </span><span class="cx"> }
</span><span class="lines">@@ -530,14 +539,25 @@
</span><span class="cx"> 
</span><span class="cx"> @end
</span><span class="cx"> 
</span><del>-@interface SWUserAgentMessageHandler : NSObject \
&lt;WKScriptMessageHandler&gt; </del><ins>+@interface SWUserAgentMessageHandler : \
NSObject &lt;WKScriptMessageHandler&gt; { +@public
+    NSString *expectedMessage;
+}
+- (instancetype)initWithExpectedMessage:(NSString *)expectedMessage;
</ins><span class="cx"> @end
</span><span class="cx"> 
</span><span class="cx"> @implementation SWUserAgentMessageHandler
</span><ins>+
+- (instancetype)initWithExpectedMessage:(NSString *)_expectedMessage
+{
+    self = [super init];
+    expectedMessage = _expectedMessage;
+    return self;
+}
+
</ins><span class="cx"> - (void)userContentController:(WKUserContentController \
*)userContentController didReceiveScriptMessage:(WKScriptMessage *)message \
</span><span class="cx"> { </span><del>-    // FIXME: navigator.userAgent currently \
does not reflect the custom user agent set by the client \
                (https://bugs.webkit.org/show_bug.cgi?id=192951).
-    // EXPECT_WK_STREQ(@&quot;Message from worker: Foo Custom UserAgent&quot;, \
[message body]); </del><ins>+    EXPECT_WK_STREQ(expectedMessage, [message body]);
</ins><span class="cx">     done = true;
</span><span class="cx"> }
</span><span class="cx"> @end
</span><span class="lines">@@ -563,7 +583,7 @@
</span><span class="cx"> 
</span><span class="cx">     auto configuration = adoptNS([[WKWebViewConfiguration \
alloc] init]); </span><span class="cx"> 
</span><del>-    auto messageHandler = adoptNS([[SWUserAgentMessageHandler alloc] \
init]); </del><ins>+    auto messageHandler = adoptNS([[SWUserAgentMessageHandler \
alloc] initWithExpectedMessage:@&quot;Message from worker: Foo Custom \
UserAgent&quot;]); </ins><span class="cx">     [[configuration userContentController] \
addScriptMessageHandler:messageHandler.get() name:@&quot;sw&quot;]; </span><span \
class="cx">  </span><span class="cx">     auto handler = adoptNS([[SWSchemes alloc] \
init]); </span><span class="lines">@@ -572,10 +592,10 @@
</span><span class="cx">     handler-&gt;expectedUserAgent = @&quot;Foo Custom \
UserAgent&quot;; </span><span class="cx">     [configuration \
setURLSchemeHandler:handler.get() forURLScheme:@&quot;SW&quot;]; </span><span \
class="cx">  </span><del>-    RetainPtr&lt;WKWebView&gt; webView = \
adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600) \
configuration:configuration.get()]); </del><ins>+    auto webView = \
adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600) \
configuration:configuration.get()]); </ins><span class="cx">     \
[webView.get().configuration.processPool \
_registerURLSchemeServiceWorkersCanHandle:@&quot;sw&quot;]; </span><span class="cx"> 
</span><del>-    auto delegate = adoptNS([[SWCustomUserAgentDelegate alloc] init]);
</del><ins>+    auto delegate = adoptNS([[SWCustomUserAgentDelegate alloc] \
initWithUserAgent:@&quot;Foo Custom UserAgent&quot;]); </ins><span class="cx">     \
[webView setNavigationDelegate:delegate.get()]; </span><span class="cx"> 
</span><span class="cx">     NSURLRequest *request = [NSURLRequest \
requestWithURL:[NSURL URLWithString:@&quot;sw://host/main.html&quot;]]; </span><span \
class="lines">@@ -583,6 +603,36 @@ </span><span class="cx"> 
</span><span class="cx">     TestWebKitAPI::Util::run(&amp;done);
</span><span class="cx">     done = false;
</span><ins>+
+    // Restore from disk.
+    webView = nullptr;
+    delegate = nullptr;
+    handler = nullptr;
+    messageHandler = nullptr;
+    configuration = nullptr;
+
+    configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
+
+    messageHandler = adoptNS([[SWUserAgentMessageHandler alloc] \
initWithExpectedMessage:@&quot;Message from worker: Bar Custom UserAgent&quot;]); +   \
[[configuration userContentController] addScriptMessageHandler:messageHandler.get() \
name:@&quot;sw&quot;]; +
+    handler = adoptNS([[SWSchemes alloc] init]);
+    handler-&gt;resources.set(&quot;sw://host/main.html&quot;, ResourceInfo { \
@&quot;text/html&quot;, mainBytes }); +    \
handler-&gt;resources.set(&quot;sw://host/sw.js&quot;, ResourceInfo { \
@&quot;application/javascript&quot;, userAgentSWBytes }); +    \
handler-&gt;expectedUserAgent = @&quot;Bar Custom UserAgent&quot;; +    \
[configuration setURLSchemeHandler:handler.get() forURLScheme:@&quot;SW&quot;]; +
+    webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600) \
configuration:configuration.get()]); +    [webView.get().configuration.processPool \
_registerURLSchemeServiceWorkersCanHandle:@&quot;sw&quot;]; +
+    delegate = adoptNS([[SWCustomUserAgentDelegate alloc] \
initWithUserAgent:@&quot;Bar Custom UserAgent&quot;]); +    [webView \
setNavigationDelegate:delegate.get()]; +
+    request = [NSURLRequest requestWithURL:[NSURL \
URLWithString:@&quot;sw://host/main.html&quot;]]; +    [webView loadRequest:request];
+
+    TestWebKitAPI::Util::run(&amp;done);
+    done = false;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> TEST(ServiceWorkers, RestoreFromDisk)
</span></span></pre>
</div>
</div>

</body>
</html>



_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes


[prev in list] [next in list] [prev in thread] [next in thread]

Configure | About | News | Add a list | Sponsored by KoreLogic