<!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>[287647] branches/safari-612-branch</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/287647">287647</a></dd>
<dt>Author</dt> <dd>repstein@apple.com</dd>
<dt>Date</dt> <dd>2022-01-05 13:11:29 -0800 (Wed, 05 Jan 2022)</dd>
</dl>

<h3>Log Message</h3>
<pre>Revert "Cherry-pick <a href="http://trac.webkit.org/projects/webkit/changeset/287353">r287353</a>. rdar://problem/87125345"

This reverts commit <a href="http://trac.webkit.org/projects/webkit/changeset/287633">r287633</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari612branchLayoutTestsChangeLog">branches/safari-612-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari612branchSourceWebCoreChangeLog">branches/safari-612-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari612branchSourceWebCoreloaderFrameLoadercpp">branches/safari-612-branch/Source/WebCore/loader/FrameLoader.cpp</a></li>
<li><a href="#branchessafari612branchSourceWebCoreloaderFrameLoaderh">branches/safari-612-branch/Source/WebCore/loader/FrameLoader.h</a></li>
<li><a href="#branchessafari612branchSourceWebCoretestingServiceWorkerInternalscpp">branches/safari-612-branch/Source/WebCore/testing/ServiceWorkerInternals.cpp</a></li>
<li><a href="#branchessafari612branchSourceWebCoretestingServiceWorkerInternalsh">branches/safari-612-branch/Source/WebCore/testing/ServiceWorkerInternals.h</a></li>
<li><a href="#branchessafari612branchSourceWebCoretestingServiceWorkerInternalsidl">branches/safari-612-branch/Source/WebCore/testing/ServiceWorkerInternals.idl</a></li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li><a href="#branchessafari612branchLayoutTestshttpwptserviceworkersnavigationiframesiteworkerjs">branches/safari-612-branch/LayoutTests/http/wpt/service-workers/navigation-iframe-site-worker.js</a></li>
<li><a href="#branchessafari612branchLayoutTestshttpwptserviceworkersnavigationiframesitehttpsexpectedtxt">branches/safari-612-branch/LayoutTests/http/wpt/service-workers/navigation-iframe-site.https-expected.txt</a></li>
<li><a href="#branchessafari612branchLayoutTestshttpwptserviceworkersnavigationiframesitehttpshtml">branches/safari-612-branch/LayoutTests/http/wpt/service-workers/navigation-iframe-site.https.html</a></li>
<li><a href="#branchessafari612branchLayoutTestshttpwptserviceworkersresourcesnavigationiframesiteframehtml">branches/safari-612-branch/LayoutTests/http/wpt/service-workers/resources/navigation-iframe-site-frame.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari612branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-612-branch/LayoutTests/ChangeLog (287646 => 287647)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612-branch/LayoutTests/ChangeLog 2022-01-05 20:08:29 UTC (rev 287646)
+++ branches/safari-612-branch/LayoutTests/ChangeLog    2022-01-05 21:11:29 UTC (rev 287647)
</span><span class="lines">@@ -45,53 +45,6 @@
</span><span class="cx"> 
</span><span class="cx"> 2022-01-05  Russell Epstein  <repstein@apple.com>
</span><span class="cx"> 
</span><del>-        Cherry-pick r287353. rdar://problem/87125345
-
-    Use requester when calling updateRequestAndAddExtraFields
-    https://bugs.webkit.org/show_bug.cgi?id=234507
-    <rdar://problem/85049490>
-    
-    Reviewed by Brent Fulgham.
-    
-    Source/WebCore:
-    
-    In case of navigation loads, the requester is the fetch request client.
-    As such, it should be the one used to determine whether the request is cross-origin is not.
-    Pass the requester to updateRequestAndAddExtraFields to do the correct computation.
-    Validate that some request fields are now correctly observed in service workers.
-    
-    Test: http/wpt/service-workers/navigation-iframe-site.https.html
-    
-    * loader/FrameLoader.cpp:
-    * loader/FrameLoader.h:
-    * testing/ServiceWorkerInternals.cpp:
-    * testing/ServiceWorkerInternals.h:
-    * testing/ServiceWorkerInternals.idl:
-    
-    LayoutTests:
-    
-    * http/wpt/service-workers/navigation-iframe-site-worker.js: Added.
-    * http/wpt/service-workers/navigation-iframe-site.https-expected.txt: Added.
-    * http/wpt/service-workers/navigation-iframe-site.https.html: Added.
-    * http/wpt/service-workers/resources/navigation-iframe-site-frame.html: Added.
-    
-    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@287353 268f45cc-cd09-0410-ab3c-d52691b4dbfc
-
-    2021-12-22  Youenn Fablet  <youenn@apple.com>
-
-            Use requester when calling updateRequestAndAddExtraFields
-            https://bugs.webkit.org/show_bug.cgi?id=234507
-            <rdar://problem/85049490>
-
-            Reviewed by Brent Fulgham.
-
-            * http/wpt/service-workers/navigation-iframe-site-worker.js: Added.
-            * http/wpt/service-workers/navigation-iframe-site.https-expected.txt: Added.
-            * http/wpt/service-workers/navigation-iframe-site.https.html: Added.
-            * http/wpt/service-workers/resources/navigation-iframe-site-frame.html: Added.
-
-2022-01-05  Russell Epstein  <repstein@apple.com>
-
</del><span class="cx">         Cherry-pick r285710. rdar://problem/87125070
</span><span class="cx"> 
</span><span class="cx">     REGRESSION(r285624) Using revert keyword with a css variable hits assert
</span></span></pre></div>
<a id="branchessafari612branchLayoutTestshttpwptserviceworkersnavigationiframesiteworkerjs"></a>
<div class="delfile"><h4>Deleted: branches/safari-612-branch/LayoutTests/http/wpt/service-workers/navigation-iframe-site-worker.js (287646 => 287647)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612-branch/LayoutTests/http/wpt/service-workers/navigation-iframe-site-worker.js 2022-01-05 20:08:29 UTC (rev 287646)
+++ branches/safari-612-branch/LayoutTests/http/wpt/service-workers/navigation-iframe-site-worker.js    2022-01-05 21:11:29 UTC (rev 287647)
</span><span class="lines">@@ -1,11 +0,0 @@
</span><del>-addEventListener("message", (e) => {
-    self.port = e.data.port;
-});
-
-addEventListener("fetch", (e) => {
-    if (self.internals) {
-        self.port.postMessage(self.internals.fetchEventIsSameSite(e) ? "FAIL" : "PASS");
-        return;
-    }
-    self.port.postMessage("PASS");
-});
</del></span></pre></div>
<a id="branchessafari612branchLayoutTestshttpwptserviceworkersnavigationiframesitehttpsexpectedtxt"></a>
<div class="delfile"><h4>Deleted: branches/safari-612-branch/LayoutTests/http/wpt/service-workers/navigation-iframe-site.https-expected.txt (287646 => 287647)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612-branch/LayoutTests/http/wpt/service-workers/navigation-iframe-site.https-expected.txt        2022-01-05 20:08:29 UTC (rev 287646)
+++ branches/safari-612-branch/LayoutTests/http/wpt/service-workers/navigation-iframe-site.https-expected.txt   2022-01-05 21:11:29 UTC (rev 287647)
</span><span class="lines">@@ -1,5 +0,0 @@
</span><del>-
-PASS Setup worker
-PASS Validate worker gets right request after navigation
-PASS Validate worker gets right request after post navigation
-
</del></span></pre></div>
<a id="branchessafari612branchLayoutTestshttpwptserviceworkersnavigationiframesitehttpshtml"></a>
<div class="delfile"><h4>Deleted: branches/safari-612-branch/LayoutTests/http/wpt/service-workers/navigation-iframe-site.https.html (287646 => 287647)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612-branch/LayoutTests/http/wpt/service-workers/navigation-iframe-site.https.html        2022-01-05 20:08:29 UTC (rev 287646)
+++ branches/safari-612-branch/LayoutTests/http/wpt/service-workers/navigation-iframe-site.https.html   2022-01-05 21:11:29 UTC (rev 287647)
</span><span class="lines">@@ -1,68 +0,0 @@
</span><del>-<html>
-<head>
-<title>Service Worker Fetch Event</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-</head>
-<body>
-<script>
-var scope = "resources/";
-var registration;
-const channel = new MessageChannel;
-
-function withFrame(url)
-{
-    return new Promise((resolve) => {
-        let frame = document.createElement('iframe');
-        frame.src = url;
-        frame.onload = function() { resolve(frame); };
-        document.body.appendChild(frame);
-    });
-}
-
-async function registerServiceWorker(scope)
-{
-    var registration = await navigator.serviceWorker.register("navigation-iframe-site-worker.js", { scope : scope });
-    var activeWorker = registration.active;
-    if (activeWorker) {
-        activeWorker.postMessage({ port: channel.port1 }, [channel.port1]);
-        return;
-    }
-    activeWorker = registration.installing;
-    activeWorker.postMessage({ port: channel.port1 }, [channel.port1]);
-    return new Promise(resolve => {
-        activeWorker.addEventListener('statechange', () => {
-            if (activeWorker.state === "activated")
-                resolve(registration);
-        });
-    });
-}
-
-promise_test(async (test) => {
-    registration = await registerServiceWorker(scope);
-}, "Setup worker");
-
-promise_test(async (test) => {
-    const resultPromise = new Promise(resolve => channel.port2.onmessage = (event) => resolve(event.data));
-
-    // Cross-origin iframe that will redirect to iframe that will be controlled by registered service worker.
-    const framePromise = withFrame("https://127.0.0.1:9443/WebKit/service-workers/resources/navigation-iframe-site-frame.html");
-
-    assert_equals(await resultPromise, "PASS");
-    const frame = await framePromise;
-    frame.remove();
-}, "Validate worker gets right request after navigation");
-
-promise_test(async (test) => {
-    const resultPromise = new Promise(resolve => channel.port2.onmessage = (event) => resolve(event.data));
-
-    // Cross-origin iframe that will redirect to iframe that will be controlled by registered service worker through POST.
-    const framePromise = withFrame("https://127.0.0.1:9443/WebKit/service-workers/resources/navigation-iframe-site-frame.html?post");
-
-    assert_equals(await resultPromise, "PASS");
-    const frame = await framePromise;
-    frame.remove();
-}, "Validate worker gets right request after post navigation");
-</script>
-</body>
-</html>
</del></span></pre></div>
<a id="branchessafari612branchLayoutTestshttpwptserviceworkersresourcesnavigationiframesiteframehtml"></a>
<div class="delfile"><h4>Deleted: branches/safari-612-branch/LayoutTests/http/wpt/service-workers/resources/navigation-iframe-site-frame.html (287646 => 287647)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612-branch/LayoutTests/http/wpt/service-workers/resources/navigation-iframe-site-frame.html      2022-01-05 20:08:29 UTC (rev 287646)
+++ branches/safari-612-branch/LayoutTests/http/wpt/service-workers/resources/navigation-iframe-site-frame.html 2022-01-05 21:11:29 UTC (rev 287647)
</span><span class="lines">@@ -1,13 +0,0 @@
</span><del>-<form method="post" id="myForm" action="https://localhost:9443/WebKit/service-workers/resources/">
-<script>
-function doTest()
-{
-    if (window.location.search !== "?post") {
-        window.location = "https://localhost:9443/WebKit/service-workers/resources/";
-        return;
-    }
-    myForm.submit();
-}
-
-doTest();
-</script>
</del></span></pre></div>
<a id="branchessafari612branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-612-branch/Source/WebCore/ChangeLog (287646 => 287647)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612-branch/Source/WebCore/ChangeLog      2022-01-05 20:08:29 UTC (rev 287646)
+++ branches/safari-612-branch/Source/WebCore/ChangeLog 2022-01-05 21:11:29 UTC (rev 287647)
</span><span class="lines">@@ -1,60 +1,5 @@
</span><span class="cx"> 2022-01-05  Russell Epstein  <repstein@apple.com>
</span><span class="cx"> 
</span><del>-        Cherry-pick r287353. rdar://problem/87125345
-
-    Use requester when calling updateRequestAndAddExtraFields
-    https://bugs.webkit.org/show_bug.cgi?id=234507
-    <rdar://problem/85049490>
-    
-    Reviewed by Brent Fulgham.
-    
-    Source/WebCore:
-    
-    In case of navigation loads, the requester is the fetch request client.
-    As such, it should be the one used to determine whether the request is cross-origin is not.
-    Pass the requester to updateRequestAndAddExtraFields to do the correct computation.
-    Validate that some request fields are now correctly observed in service workers.
-    
-    Test: http/wpt/service-workers/navigation-iframe-site.https.html
-    
-    * loader/FrameLoader.cpp:
-    * loader/FrameLoader.h:
-    * testing/ServiceWorkerInternals.cpp:
-    * testing/ServiceWorkerInternals.h:
-    * testing/ServiceWorkerInternals.idl:
-    
-    LayoutTests:
-    
-    * http/wpt/service-workers/navigation-iframe-site-worker.js: Added.
-    * http/wpt/service-workers/navigation-iframe-site.https-expected.txt: Added.
-    * http/wpt/service-workers/navigation-iframe-site.https.html: Added.
-    * http/wpt/service-workers/resources/navigation-iframe-site-frame.html: Added.
-    
-    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@287353 268f45cc-cd09-0410-ab3c-d52691b4dbfc
-
-    2021-12-22  Youenn Fablet  <youenn@apple.com>
-
-            Use requester when calling updateRequestAndAddExtraFields
-            https://bugs.webkit.org/show_bug.cgi?id=234507
-            <rdar://problem/85049490>
-
-            Reviewed by Brent Fulgham.
-
-            In case of navigation loads, the requester is the fetch request client.
-            As such, it should be the one used to determine whether the request is cross-origin is not.
-            Pass the requester to updateRequestAndAddExtraFields to do the correct computation.
-            Validate that some request fields are now correctly observed in service workers.
-
-            Test: http/wpt/service-workers/navigation-iframe-site.https.html
-
-            * loader/FrameLoader.cpp:
-            * loader/FrameLoader.h:
-            * testing/ServiceWorkerInternals.cpp:
-            * testing/ServiceWorkerInternals.h:
-            * testing/ServiceWorkerInternals.idl:
-
-2022-01-05  Russell Epstein  <repstein@apple.com>
-
</del><span class="cx">         Cherry-pick r287286. rdar://problem/87124952
</span><span class="cx"> 
</span><span class="cx">     Don't include SVGImageForContainers in allCachedSVGImages
</span></span></pre></div>
<a id="branchessafari612branchSourceWebCoreloaderFrameLoadercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-612-branch/Source/WebCore/loader/FrameLoader.cpp (287646 => 287647)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612-branch/Source/WebCore/loader/FrameLoader.cpp 2022-01-05 20:08:29 UTC (rev 287646)
+++ branches/safari-612-branch/Source/WebCore/loader/FrameLoader.cpp    2022-01-05 21:11:29 UTC (rev 287647)
</span><span class="lines">@@ -1356,7 +1356,7 @@
</span><span class="cx">     if (!referrer.isEmpty())
</span><span class="cx">         request.setHTTPReferrer(referrer);
</span><span class="cx"> 
</span><del>-    updateRequestAndAddExtraFields(request, IsMainResource::Yes, newLoadType, ShouldUpdateAppInitiatedValue::Yes, FrameLoader::IsServiceWorkerNavigationLoad::No, &frameLoadRequest.requester());
</del><ins>+    updateRequestAndAddExtraFields(request, IsMainResource::Yes, newLoadType);
</ins><span class="cx"> 
</span><span class="cx">     ASSERT(newLoadType != FrameLoadType::Same);
</span><span class="cx"> 
</span><span class="lines">@@ -2905,7 +2905,7 @@
</span><span class="cx">     return ResourceRequestCachePolicy::UseProtocolCachePolicy;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void FrameLoader::updateRequestAndAddExtraFields(ResourceRequest& request, IsMainResource mainResource, FrameLoadType loadType, ShouldUpdateAppInitiatedValue shouldUpdate, Document* initiator)
</del><ins>+void FrameLoader::updateRequestAndAddExtraFields(ResourceRequest& request, IsMainResource mainResource, FrameLoadType loadType, ShouldUpdateAppInitiatedValue shouldUpdate)
</ins><span class="cx"> {
</span><span class="cx">     // If the request came from a previous process due to process-swap-on-navigation then we should not modify the request.
</span><span class="cx">     if (m_currentLoadContinuingState == LoadContinuingState::ContinuingWithRequest)
</span><span class="lines">@@ -2923,16 +2923,14 @@
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     if (request.isSameSiteUnspecified()) {
</span><del>-        if (!initiator) {
-            initiator = m_frame.document();
-            if (isMainResource) {
-                auto* ownerFrame = m_frame.tree().parent();
-                if (!ownerFrame && m_stateMachine.isDisplayingInitialEmptyDocument())
-                    ownerFrame = m_opener.get();
-                if (ownerFrame)
-                    initiator = ownerFrame->document();
-                ASSERT(ownerFrame || m_frame.isMainFrame());
-            }
</del><ins>+        auto* initiator = m_frame.document();
+        if (isMainResource) {
+            auto* ownerFrame = m_frame.tree().parent();
+            if (!ownerFrame && m_stateMachine.isDisplayingInitialEmptyDocument())
+                ownerFrame = m_opener.get();
+            if (ownerFrame)
+                initiator = ownerFrame->document();
+            ASSERT(ownerFrame || m_frame.isMainFrame());
</ins><span class="cx">         }
</span><span class="cx">         addSameSiteInfoToRequestIfNeeded(request, initiator);
</span><span class="cx">     }
</span><span class="lines">@@ -3066,7 +3064,7 @@
</span><span class="cx">     workingResourceRequest.setHTTPMethod("POST");
</span><span class="cx">     workingResourceRequest.setHTTPBody(inRequest.httpBody());
</span><span class="cx">     workingResourceRequest.setHTTPContentType(contentType);
</span><del>-    updateRequestAndAddExtraFields(workingResourceRequest, IsMainResource::Yes, loadType, ShouldUpdateAppInitiatedValue::Yes, FrameLoader::IsServiceWorkerNavigationLoad::No, &request.requester());
</del><ins>+    updateRequestAndAddExtraFields(workingResourceRequest, IsMainResource::Yes, loadType);
</ins><span class="cx"> 
</span><span class="cx">     if (Document* document = m_frame.document())
</span><span class="cx">         document->contentSecurityPolicy()->upgradeInsecureRequestIfNeeded(workingResourceRequest, ContentSecurityPolicy::InsecureRequestType::Load);
</span></span></pre></div>
<a id="branchessafari612branchSourceWebCoreloaderFrameLoaderh"></a>
<div class="modfile"><h4>Modified: branches/safari-612-branch/Source/WebCore/loader/FrameLoader.h (287646 => 287647)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612-branch/Source/WebCore/loader/FrameLoader.h   2022-01-05 20:08:29 UTC (rev 287646)
+++ branches/safari-612-branch/Source/WebCore/loader/FrameLoader.h      2022-01-05 21:11:29 UTC (rev 287647)
</span><span class="lines">@@ -318,7 +318,7 @@
</span><span class="cx">     bool alwaysAllowLocalWebarchive() const { return m_alwaysAllowLocalWebarchive; }
</span><span class="cx"> 
</span><span class="cx">     // For subresource requests the FrameLoadType parameter has no effect and can be skipped.
</span><del>-    void updateRequestAndAddExtraFields(ResourceRequest&, IsMainResource, FrameLoadType = FrameLoadType::Standard, ShouldUpdateAppInitiatedValue = ShouldUpdateAppInitiatedValue::Yes, Document* = nullptr);
</del><ins>+    void updateRequestAndAddExtraFields(ResourceRequest&, IsMainResource, FrameLoadType = FrameLoadType::Standard, ShouldUpdateAppInitiatedValue = ShouldUpdateAppInitiatedValue::Yes);
</ins><span class="cx"> 
</span><span class="cx">     void scheduleRefreshIfNeeded(Document&, const String& content, IsMetaRefresh);
</span><span class="cx"> 
</span></span></pre></div>
<a id="branchessafari612branchSourceWebCoretestingServiceWorkerInternalscpp"></a>
<div class="modfile"><h4>Modified: branches/safari-612-branch/Source/WebCore/testing/ServiceWorkerInternals.cpp (287646 => 287647)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612-branch/Source/WebCore/testing/ServiceWorkerInternals.cpp     2022-01-05 20:08:29 UTC (rev 287646)
+++ branches/safari-612-branch/Source/WebCore/testing/ServiceWorkerInternals.cpp        2022-01-05 21:11:29 UTC (rev 287647)
</span><span class="lines">@@ -136,11 +136,6 @@
</span><span class="cx">     });
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-bool ServiceWorkerInternals::fetchEventIsSameSite(FetchEvent& event)
-{
-    return event.request().internalRequest().isSameSite();
-}
-
</del><span class="cx"> } // namespace WebCore
</span><span class="cx"> 
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="branchessafari612branchSourceWebCoretestingServiceWorkerInternalsh"></a>
<div class="modfile"><h4>Modified: branches/safari-612-branch/Source/WebCore/testing/ServiceWorkerInternals.h (287646 => 287647)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612-branch/Source/WebCore/testing/ServiceWorkerInternals.h       2022-01-05 20:08:29 UTC (rev 287646)
+++ branches/safari-612-branch/Source/WebCore/testing/ServiceWorkerInternals.h  2022-01-05 21:11:29 UTC (rev 287647)
</span><span class="lines">@@ -62,8 +62,6 @@
</span><span class="cx"> 
</span><span class="cx">     void lastNavigationWasAppInitiated(Ref<DeferredPromise>&&);
</span><span class="cx"> 
</span><del>-    bool fetchEventIsSameSite(FetchEvent&);
-
</del><span class="cx"> private:
</span><span class="cx">     explicit ServiceWorkerInternals(ServiceWorkerIdentifier);
</span><span class="cx"> 
</span></span></pre></div>
<a id="branchessafari612branchSourceWebCoretestingServiceWorkerInternalsidl"></a>
<div class="modfile"><h4>Modified: branches/safari-612-branch/Source/WebCore/testing/ServiceWorkerInternals.idl (287646 => 287647)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612-branch/Source/WebCore/testing/ServiceWorkerInternals.idl     2022-01-05 20:08:29 UTC (rev 287646)
+++ branches/safari-612-branch/Source/WebCore/testing/ServiceWorkerInternals.idl        2022-01-05 21:11:29 UTC (rev 287647)
</span><span class="lines">@@ -44,6 +44,4 @@
</span><span class="cx">     readonly attribute long processIdentifier;
</span><span class="cx"> 
</span><span class="cx">     Promise<boolean> lastNavigationWasAppInitiated();
</span><del>-
-    boolean fetchEventIsSameSite(FetchEvent event);
</del><span class="cx"> };
</span></span></pre>
</div>
</div>

</body>
</html>