<!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>[226188] 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/226188">226188</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2017-12-20 10:30:06 -0800 (Wed, 20 Dec 2017)</dd>
</dl>

<h3>Log Message</h3>
<pre>Do not reuse resource for memory cache if selected service worker differs
https://bugs.webkit.org/show_bug.cgi?id=181042

Reviewed by Youenn Fablet.

LayoutTests/imported/w3c:

Rebaseline WPT test now that it is consistently passing.

* web-platform-tests/service-workers/service-worker/unregister-controller.https-expected.txt:

Source/WebCore:

No new tests, rebaselined existing test.

* loader/cache/CachedResource.h:
(WebCore::CachedResource::options const):
* loader/cache/CachedResourceLoader.cpp:
(WebCore::CachedResourceLoader::determineRevalidationPolicy const):

LayoutTests:

Drop test from flaky list now that it is consistently passing.

* TestExpectations:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsTestExpectations">trunk/LayoutTests/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsimportedw3cChangeLog">trunk/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsserviceworkersserviceworkerunregistercontrollerhttpsexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/service-workers/service-worker/unregister-controller.https-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedResourceh">trunk/Source/WebCore/loader/cache/CachedResource.h</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedResourceLoadercpp">trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (226187 => 226188)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog      2017-12-20 18:08:51 UTC (rev 226187)
+++ trunk/LayoutTests/ChangeLog 2017-12-20 18:30:06 UTC (rev 226188)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2017-12-20  Chris Dumez  <cdumez@apple.com>
+
+        Do not reuse resource for memory cache if selected service worker differs
+        https://bugs.webkit.org/show_bug.cgi?id=181042
+
+        Reviewed by Youenn Fablet.
+
+        Drop test from flaky list now that it is consistently passing.
+
+        * TestExpectations:
+
</ins><span class="cx"> 2017-12-20  Matt Lewis  <jlewis3@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Marked svg/animations/smil-leak-element-instances-noBaseValRef.svg as flaky on macOS WK1.
</span></span></pre></div>
<a id="trunkLayoutTestsTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/TestExpectations (226187 => 226188)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/TestExpectations       2017-12-20 18:08:51 UTC (rev 226187)
+++ trunk/LayoutTests/TestExpectations  2017-12-20 18:30:06 UTC (rev 226188)
</span><span class="lines">@@ -180,7 +180,6 @@
</span><span class="cx"> imported/w3c/web-platform-tests/service-workers/service-worker/registration-service-worker-attributes.https.html [ Pass Failure ]
</span><span class="cx"> imported/w3c/web-platform-tests/service-workers/service-worker/service-worker-csp-connect.https.html [ Pass Failure ]
</span><span class="cx"> imported/w3c/web-platform-tests/service-workers/service-worker/uncontrolled-page.https.html [ Pass Failure ]
</span><del>-imported/w3c/web-platform-tests/service-workers/service-worker/unregister-controller.https.html [ Pass Failure ]
</del><span class="cx"> imported/w3c/web-platform-tests/service-workers/service-worker/websocket.https.html [ Pass Failure ]
</span><span class="cx"> imported/w3c/web-platform-tests/service-workers/service-worker/windowclient-navigate.https.html [ Pass Failure ]
</span><span class="cx"> imported/w3c/web-platform-tests/streams/readable-byte-streams/detached-buffers.serviceworker.https.html [ Pass Failure ]
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/ChangeLog (226187 => 226188)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/ChangeLog 2017-12-20 18:08:51 UTC (rev 226187)
+++ trunk/LayoutTests/imported/w3c/ChangeLog    2017-12-20 18:30:06 UTC (rev 226188)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2017-12-20  Chris Dumez  <cdumez@apple.com>
+
+        Do not reuse resource for memory cache if selected service worker differs
+        https://bugs.webkit.org/show_bug.cgi?id=181042
+
+        Reviewed by Youenn Fablet.
+
+        Rebaseline WPT test now that it is consistently passing.
+
+        * web-platform-tests/service-workers/service-worker/unregister-controller.https-expected.txt:
+
</ins><span class="cx"> 2017-12-19  Chris Dumez  <cdumez@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [Fetch] Extracting a body of type Blob should not set Content-Type to the empty string
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsserviceworkersserviceworkerunregistercontrollerhttpsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/service-workers/service-worker/unregister-controller.https-expected.txt (226187 => 226188)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/service-workers/service-worker/unregister-controller.https-expected.txt        2017-12-20 18:08:51 UTC (rev 226187)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/service-workers/service-worker/unregister-controller.https-expected.txt   2017-12-20 18:30:06 UTC (rev 226188)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> PASS Unregister does not affect existing controller 
</span><del>-FAIL Unregister prevents control of subsequent navigations assert_unreached: unexpected rejection: assert_equals: requests should not be intercepted expected "a simple text file\n" but got "intercepted by service worker" Reached unreachable code
</del><ins>+PASS Unregister prevents control of subsequent navigations 
</ins><span class="cx"> PASS Unregister prevents new controllee even if registration is still in use 
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (226187 => 226188)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2017-12-20 18:08:51 UTC (rev 226187)
+++ trunk/Source/WebCore/ChangeLog      2017-12-20 18:30:06 UTC (rev 226188)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2017-12-20  Chris Dumez  <cdumez@apple.com>
+
+        Do not reuse resource for memory cache if selected service worker differs
+        https://bugs.webkit.org/show_bug.cgi?id=181042
+
+        Reviewed by Youenn Fablet.
+
+        No new tests, rebaselined existing test.
+
+        * loader/cache/CachedResource.h:
+        (WebCore::CachedResource::options const):
+        * loader/cache/CachedResourceLoader.cpp:
+        (WebCore::CachedResourceLoader::determineRevalidationPolicy const):
+
</ins><span class="cx"> 2017-12-20  Youenn Fablet  <youenn@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Do not search for service worker registration in case of non HTTP navigation loads
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResource.h (226187 => 226188)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResource.h       2017-12-20 18:08:51 UTC (rev 226187)
+++ trunk/Source/WebCore/loader/cache/CachedResource.h  2017-12-20 18:30:06 UTC (rev 226188)
</span><span class="lines">@@ -234,7 +234,7 @@
</span><span class="cx">     DataBufferingPolicy dataBufferingPolicy() const { return m_options.dataBufferingPolicy; }
</span><span class="cx"> 
</span><span class="cx">     bool allowsCaching() const { return m_options.cachingPolicy == CachingPolicy::AllowCaching; }
</span><del>-    const FetchOptions& options() const { return m_options; }
</del><ins>+    const ResourceLoaderOptions& options() const { return m_options; }
</ins><span class="cx"> 
</span><span class="cx">     virtual void destroyDecodedData() { }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp (226187 => 226188)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp       2017-12-20 18:08:51 UTC (rev 226187)
+++ trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp  2017-12-20 18:30:06 UTC (rev 226188)
</span><span class="lines">@@ -1024,6 +1024,14 @@
</span><span class="cx">     if (request.cachePolicy() == RefreshAnyCacheData)
</span><span class="cx">         return Reload;
</span><span class="cx"> 
</span><ins>+#if ENABLE(SERVICE_WORKER)
+    // FIXME: We should validate/specify this behavior.
+    if (cachedResourceRequest.options().serviceWorkerIdentifier != existingResource->options().serviceWorkerIdentifier) {
+        LOG(ResourceLoading, "CachedResourceLoader::determineRevalidationPolicy reloading because selected service worker differs");
+        return Reload;
+    }
+#endif
+
</ins><span class="cx">     // We already have a preload going for this URL.
</span><span class="cx">     if (forPreload == ForPreload::Yes && existingResource->isPreloaded())
</span><span class="cx">         return Use;
</span></span></pre>
</div>
</div>

</body>
</html>