[prev in list] [next in list] [prev in thread] [next in thread]
List: webkit-changes
Subject: [webkit-changes] [259309] branches/safari-610.1.7-branch/Source/WebKit
From: alancoon () apple ! com
Date: 2020-03-31 20:38:00
Message-ID: 20200331203801.2B05F10051CD () 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>[259309] branches/safari-610.1.7-branch/Source/WebKit</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/259309">259309</a></dd> \
<dt>Author</dt> <dd>alancoon@apple.com</dd> <dt>Date</dt> <dd>2020-03-31 13:38:00 \
-0700 (Tue, 31 Mar 2020)</dd> </dl>
<h3>Log Message</h3>
<pre>Cherry-pick <a href="http://trac.webkit.org/projects/webkit/changeset/258600">r258600</a>. \
rdar://problem/61082995
Add internal debugging when initializing an app-bound session
https://bugs.webkit.org/show_bug.cgi?id=209190
<rdar://problem/60371620>
Reviewed by Brent Fulgham.
* NetworkProcess/cocoa/NetworkDataTaskCocoa.mm:
(WebKit::NetworkDataTaskCocoa::NetworkDataTaskCocoa):
* NetworkProcess/cocoa/NetworkSessionCocoa.h:
* NetworkProcess/cocoa/NetworkSessionCocoa.mm:
(WebKit::SessionWrapper::initialize):
(WebKit::NetworkSessionCocoa::NetworkSessionCocoa):
(WebKit::NetworkSessionCocoa::initializeEphemeralStatelessSession):
(WebKit::NetworkSessionCocoa::sessionWrapperForTask):
(WebKit::NetworkSessionCocoa::appBoundSession):
(WebKit::NetworkSessionCocoa::isolatedSession):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@258600 \
268f45cc-cd09-0410-ab3c-d52691b4dbfc</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari61017branchSourceWebKitChangeLog">branches/safari-610.1.7-branch/Source/WebKit/ChangeLog</a></li>
<li><a href="#branchessafari61017branchSourceWebKitNetworkProcesscocoaNetworkDataTask \
Cocoamm">branches/safari-610.1.7-branch/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm</a></li>
<li><a href="#branchessafari61017branchSourceWebKitNetworkProcesscocoaNetworkSessionC \
ocoah">branches/safari-610.1.7-branch/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.h</a></li>
<li><a href="#branchessafari61017branchSourceWebKitNetworkProcesscocoaNetworkSessionC \
ocoamm">branches/safari-610.1.7-branch/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari61017branchSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: \
branches/safari-610.1.7-branch/Source/WebKit/ChangeLog (259308 => 259309)</h4> <pre \
class="diff"><span> <span class="info">--- \
branches/safari-610.1.7-branch/Source/WebKit/ChangeLog 2020-03-31 20:21:48 UTC (rev \
259308)
+++ branches/safari-610.1.7-branch/Source/WebKit/ChangeLog 2020-03-31 20:38:00 UTC \
(rev 259309) </span><span class="lines">@@ -1,3 +1,46 @@
</span><ins>+2020-03-31 Alan Coon <alancoon@apple.com>
+
+ Cherry-pick r258600. rdar://problem/61082995
+
+ Add internal debugging when initializing an app-bound session
+ https://bugs.webkit.org/show_bug.cgi?id=209190
+ <rdar://problem/60371620>
+
+ Reviewed by Brent Fulgham.
+
+ * NetworkProcess/cocoa/NetworkDataTaskCocoa.mm:
+ (WebKit::NetworkDataTaskCocoa::NetworkDataTaskCocoa):
+ * NetworkProcess/cocoa/NetworkSessionCocoa.h:
+ * NetworkProcess/cocoa/NetworkSessionCocoa.mm:
+ (WebKit::SessionWrapper::initialize):
+ (WebKit::NetworkSessionCocoa::NetworkSessionCocoa):
+ (WebKit::NetworkSessionCocoa::initializeEphemeralStatelessSession):
+ (WebKit::NetworkSessionCocoa::sessionWrapperForTask):
+ (WebKit::NetworkSessionCocoa::appBoundSession):
+ (WebKit::NetworkSessionCocoa::isolatedSession):
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@258600 \
268f45cc-cd09-0410-ab3c-d52691b4dbfc +
+ 2020-03-17 Kate Cheney <katherine_cheney@apple.com>
+
+ Add internal debugging when initializing an app-bound session
+ https://bugs.webkit.org/show_bug.cgi?id=209190
+ <rdar://problem/60371620>
+
+ Reviewed by Brent Fulgham.
+
+ * NetworkProcess/cocoa/NetworkDataTaskCocoa.mm:
+ (WebKit::NetworkDataTaskCocoa::NetworkDataTaskCocoa):
+ * NetworkProcess/cocoa/NetworkSessionCocoa.h:
+ * NetworkProcess/cocoa/NetworkSessionCocoa.mm:
+ (WebKit::SessionWrapper::initialize):
+ (WebKit::NetworkSessionCocoa::NetworkSessionCocoa):
+ (WebKit::NetworkSessionCocoa::initializeEphemeralStatelessSession):
+ (WebKit::NetworkSessionCocoa::sessionWrapperForTask):
+ (WebKit::NetworkSessionCocoa::appBoundSession):
+ (WebKit::NetworkSessionCocoa::isolatedSession):
+
</ins><span class="cx"> 2020-03-30 Alan Coon <alancoon@apple.com>
</span><span class="cx">
</span><span class="cx"> Cherry-pick r258958. rdar://problem/61082960
</span></span></pre></div>
<a id="branchessafari61017branchSourceWebKitNetworkProcesscocoaNetworkDataTaskCocoamm"></a>
<div class="modfile"><h4>Modified: \
branches/safari-610.1.7-branch/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm \
(259308 => 259309)</h4> <pre class="diff"><span>
<span class="info">--- \
branches/safari-610.1.7-branch/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm 2020-03-31 \
20:21:48 UTC (rev 259308)
+++ branches/safari-610.1.7-branch/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm 2020-03-31 \
20:38:00 UTC (rev 259309) </span><span class="lines">@@ -52,12 +52,6 @@
</span><span class="cx"> #import <CFNetwork/CFNSURLConnection.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if USE(APPLE_INTERNAL_SDK)
-#include <WebKitAdditions/NetworkDataTaskCocoaAdditions.h>
-#else
-#define NETWORK_DATA_TASK_COCOA_ADDITIONS
-#endif
-
</del><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> #if USE(CREDENTIAL_STORAGE_WITH_NETWORK_SESSION)
</span><span class="lines">@@ -187,8 +181,6 @@
</span><span class="cx"> , \
m_isForMainResourceNavigationForAnyFrame(dataTaskIsForMainResourceNavigationForAnyFrame)
</span><span class="cx"> , \
m_isAlwaysOnLoggingAllowed(computeIsAlwaysOnLoggingAllowed(session)) </span><span \
class="cx"> { </span><del>- NETWORK_DATA_TASK_COCOA_ADDITIONS
-
</del><span class="cx"> if (m_scheduledFailureType != NoFailure)
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari61017branchSourceWebKitNetworkProcesscocoaNetworkSessionCocoah"></a>
<div class="modfile"><h4>Modified: \
branches/safari-610.1.7-branch/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.h \
(259308 => 259309)</h4> <pre class="diff"><span>
<span class="info">--- \
branches/safari-610.1.7-branch/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.h 2020-03-31 \
20:21:48 UTC (rev 259308)
+++ branches/safari-610.1.7-branch/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.h 2020-03-31 \
20:38:00 UTC (rev 259309) </span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> class NetworkSessionCocoa;
</span><span class="cx">
</span><span class="cx"> struct SessionWrapper : public \
CanMakeWeakPtr<SessionWrapper> { </span><del>- void \
initialize(NSURLSessionConfiguration *, NetworkSessionCocoa&, \
WebCore::StoredCredentialsPolicy); </del><ins>+ void \
initialize(NSURLSessionConfiguration *, NetworkSessionCocoa&, \
WebCore::StoredCredentialsPolicy, NavigatingToAppBoundDomain); </ins><span \
class="cx"> </span><span class="cx"> RetainPtr<NSURLSession> session;
</span><span class="cx"> RetainPtr<WKNetworkSessionDelegate> delegate;
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx"> NetworkSessionCocoa(NetworkProcess&, \
NetworkSessionCreationParameters&&); </span><span class="cx"> \
~NetworkSessionCocoa(); </span><span class="cx">
</span><del>- void initializeEphemeralStatelessSession();
</del><ins>+ void initializeEphemeralStatelessSession(NavigatingToAppBoundDomain);
</ins><span class="cx">
</span><span class="cx"> const String& boundInterfaceIdentifier() const;
</span><span class="cx"> const String& sourceApplicationBundleIdentifier() \
const; </span><span class="lines">@@ -104,7 +104,7 @@
</span><span class="cx"> void clearCredentials() override;
</span><span class="cx"> bool shouldLogCookieInformation() const override { \
return m_shouldLogCookieInformation; } </span><span class="cx"> Seconds \
loadThrottleLatency() const override { return m_loadThrottleLatency; } </span><del>- \
SessionWrapper& isolatedSession(WebCore::StoredCredentialsPolicy, const \
WebCore::RegistrableDomain); </del><ins>+ SessionWrapper& \
isolatedSession(WebCore::StoredCredentialsPolicy, const WebCore::RegistrableDomain, \
NavigatingToAppBoundDomain); </ins><span class="cx"> SessionWrapper& \
appBoundSession(WebCore::StoredCredentialsPolicy); </span><span class="cx">
</span><span class="cx"> Vector<WebCore::SecurityOriginData> \
hostNamesWithAlternativeServices() const override; </span></span></pre></div>
<a id="branchessafari61017branchSourceWebKitNetworkProcesscocoaNetworkSessionCocoamm"></a>
<div class="modfile"><h4>Modified: \
branches/safari-610.1.7-branch/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm \
(259308 => 259309)</h4> <pre class="diff"><span>
<span class="info">--- \
branches/safari-610.1.7-branch/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2020-03-31 \
20:21:48 UTC (rev 259308)
+++ branches/safari-610.1.7-branch/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2020-03-31 \
20:38:00 UTC (rev 259309) </span><span class="lines">@@ -62,7 +62,8 @@
</span><span class="cx"> #if USE(APPLE_INTERNAL_SDK)
</span><span class="cx"> #include \
<WebKitAdditions/NetworkSessionCocoaAdditions.h> </span><span class="cx"> #else
</span><del>-#define NETWORK_SESSION_COCOA_ADDITIONS false
</del><ins>+#define NETWORK_SESSION_COCOA_ADDITIONS_1
+#define NETWORK_SESSION_COCOA_ADDITIONS_2 false
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #import "DeviceManagementSoftLink.h"
</span><span class="lines">@@ -1054,8 +1055,10 @@
</span><span class="cx"> ALLOW_DEPRECATED_DECLARATIONS_END
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void SessionWrapper::initialize(NSURLSessionConfiguration \
*configuration, NetworkSessionCocoa& networkSession, \
WebCore::StoredCredentialsPolicy storedCredentialsPolicy) </del><ins>+void \
SessionWrapper::initialize(NSURLSessionConfiguration *configuration, \
NetworkSessionCocoa& networkSession, WebCore::StoredCredentialsPolicy \
storedCredentialsPolicy, NavigatingToAppBoundDomain isNavigatingToAppBoundDomain) \
</ins><span class="cx"> { </span><ins>+ \
UNUSED_PARAM(isNavigatingToAppBoundDomain); + NETWORK_SESSION_COCOA_ADDITIONS_1
</ins><span class="cx"> delegate = adoptNS([[WKNetworkSessionDelegate alloc] \
initWithNetworkSession:networkSession wrapper:*this \
withCredentials:storedCredentialsPolicy == WebCore::StoredCredentialsPolicy::Use]); \
</span><span class="cx"> session = [NSURLSession \
sessionWithConfiguration:configuration delegate:delegate.get() \
delegateQueue:[NSOperationQueue mainQueue]]; </span><span class="cx"> }
</span><span class="lines">@@ -1152,7 +1155,7 @@
</span><span class="cx"> cookieStorage._overrideSessionCookieAcceptPolicy = \
YES; </span><span class="cx"> #endif
</span><span class="cx">
</span><del>- m_sessionWithCredentialStorage.initialize(configuration, *this, \
WebCore::StoredCredentialsPolicy::Use); </del><ins>+ \
m_sessionWithCredentialStorage.initialize(configuration, *this, \
WebCore::StoredCredentialsPolicy::Use, NavigatingToAppBoundDomain::No); </ins><span \
class="cx"> LOG(NetworkSession, "Created NetworkSession with \
cookieAcceptPolicy %lu", configuration.HTTPCookieStorage.cookieAcceptPolicy); \
</span><span class="cx"> </span><span class="cx"> \
configuration.URLCredentialStorage = nil; </span><span class="lines">@@ -1161,7 \
+1164,7 @@ </span><span class="cx"> // configuration.HTTPCookieStorage = nil;
</span><span class="cx"> // configuration.HTTPCookieAcceptPolicy = \
NSHTTPCookieAcceptPolicyNever; </span><span class="cx">
</span><del>- m_sessionWithoutCredentialStorage.initialize(configuration, *this, \
WebCore::StoredCredentialsPolicy::DoNotUse); </del><ins>+ \
m_sessionWithoutCredentialStorage.initialize(configuration, *this, \
WebCore::StoredCredentialsPolicy::DoNotUse, NavigatingToAppBoundDomain::No); \
</ins><span class="cx"> </span><span class="cx"> \
m_deviceManagementRestrictionsEnabled = \
parameters.deviceManagementRestrictionsEnabled; </span><span class="cx"> \
m_allLoadsBlockedByDeviceManagementRestrictionsForTesting = \
parameters.allLoadsBlockedByDeviceManagementRestrictionsForTesting; </span><span \
class="lines">@@ -1183,7 +1186,7 @@ </span><span class="cx">
</span><span class="cx"> NetworkSessionCocoa::~NetworkSessionCocoa() = default;
</span><span class="cx">
</span><del>-void NetworkSessionCocoa::initializeEphemeralStatelessSession()
</del><ins>+void NetworkSessionCocoa::initializeEphemeralStatelessSession(NavigatingToAppBoundDomain \
isNavigatingToAppBoundDomain) </ins><span class="cx"> {
</span><span class="cx"> NSURLSessionConfiguration *configuration = \
[NSURLSessionConfiguration ephemeralSessionConfiguration]; </span><span class="cx"> \
NSURLSessionConfiguration *existingConfiguration = \
m_sessionWithoutCredentialStorage.session.get().configuration; </span><span \
class="lines">@@ -1201,7 +1204,7 @@ </span><span class="cx"> \
configuration._CTDataConnectionServiceType = \
existingConfiguration._CTDataConnectionServiceType; </span><span class="cx"> #endif
</span><span class="cx">
</span><del>- m_ephemeralStatelessSession.initialize(configuration, *this, \
WebCore::StoredCredentialsPolicy::EphemeralStateless); </del><ins>+ \
m_ephemeralStatelessSession.initialize(configuration, *this, \
WebCore::StoredCredentialsPolicy::EphemeralStateless, isNavigatingToAppBoundDomain); \
</ins><span class="cx"> } </span><span class="cx">
</span><span class="cx"> SessionWrapper& \
NetworkSessionCocoa::sessionWrapperForTask(const WebCore::ResourceRequest& \
request, WebCore::StoredCredentialsPolicy storedCredentialsPolicy, \
NavigatingToAppBoundDomain isNavigatingToAppBoundDomain) </span><span \
class="lines">@@ -1210,13 +1213,13 @@ </span><span class="cx"> if (auto* \
storageSession = networkStorageSession()) { </span><span class="cx"> auto \
firstParty = WebCore::RegistrableDomain(request.firstPartyForCookies()); </span><span \
class="cx"> if \
(storageSession->shouldBlockThirdPartyCookiesButKeepFirstPartyCookiesFor(firstParty))
</span><del>- return isolatedSession(storedCredentialsPolicy, \
firstParty); </del><ins>+ return isolatedSession(storedCredentialsPolicy, \
firstParty, isNavigatingToAppBoundDomain); </ins><span class="cx"> } else
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> if (isNavigatingToAppBoundDomain == \
NavigatingToAppBoundDomain::Yes) { </span><del>- if \
(m_isInAppBrowserPrivacyEnabled || NETWORK_SESSION_COCOA_ADDITIONS) </del><ins>+ \
if (m_isInAppBrowserPrivacyEnabled || NETWORK_SESSION_COCOA_ADDITIONS_2) </ins><span \
class="cx"> return appBoundSession(storedCredentialsPolicy); </span><span \
class="cx"> } </span><span class="cx">
</span><span class="lines">@@ -1227,7 +1230,7 @@
</span><span class="cx"> return m_sessionWithoutCredentialStorage;
</span><span class="cx"> case \
WebCore::StoredCredentialsPolicy::EphemeralStateless: </span><span class="cx"> \
if (!m_ephemeralStatelessSession.session) </span><del>- \
initializeEphemeralStatelessSession(); </del><ins>+ \
initializeEphemeralStatelessSession(NavigatingToAppBoundDomain::No); </ins><span \
class="cx"> return m_ephemeralStatelessSession; </span><span class="cx"> \
} </span><span class="cx"> }
</span><span class="lines">@@ -1236,8 +1239,8 @@
</span><span class="cx"> {
</span><span class="cx"> if (!m_appBoundSession) {
</span><span class="cx"> m_appBoundSession = \
makeUnique<IsolatedSession>(); </span><del>- \
m_appBoundSession->sessionWithCredentialStorage.initialize(m_sessionWithCredentialStorage.session.get().configuration, \
*this, WebCore::StoredCredentialsPolicy::Use);
- m_appBoundSession->sessionWithoutCredentialStorage.initialize(m_sessionWithoutCredentialStorage.session.get().configuration, \
*this, WebCore::StoredCredentialsPolicy::DoNotUse); </del><ins>+ \
m_appBoundSession->sessionWithCredentialStorage.initialize(m_sessionWithCredentialStorage.session.get().configuration, \
*this, WebCore::StoredCredentialsPolicy::Use, NavigatingToAppBoundDomain::Yes); + \
m_appBoundSession->sessionWithoutCredentialStorage.initialize(m_sessionWithoutCredentialStorage.session.get().configuration, \
*this, WebCore::StoredCredentialsPolicy::DoNotUse, NavigatingToAppBoundDomain::Yes); \
</ins><span class="cx"> } </span><span class="cx">
</span><span class="cx"> auto& sessionWrapper = [&] (auto \
storedCredentialsPolicy) -> SessionWrapper& { </span><span class="lines">@@ \
-1250,7 +1253,7 @@ </span><span class="cx"> return \
m_appBoundSession->sessionWithoutCredentialStorage; </span><span class="cx"> \
case WebCore::StoredCredentialsPolicy::EphemeralStateless: </span><span class="cx"> \
if (!m_ephemeralStatelessSession.session) </span><del>- \
initializeEphemeralStatelessSession(); </del><ins>+ \
initializeEphemeralStatelessSession(NavigatingToAppBoundDomain::Yes); </ins><span \
class="cx"> return m_ephemeralStatelessSession; </span><span class="cx"> \
} </span><span class="cx"> } (storedCredentialsPolicy);
</span><span class="lines">@@ -1258,12 +1261,12 @@
</span><span class="cx"> return sessionWrapper;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-SessionWrapper& \
NetworkSessionCocoa::isolatedSession(WebCore::StoredCredentialsPolicy \
storedCredentialsPolicy, const WebCore::RegistrableDomain firstPartyDomain) \
</del><ins>+SessionWrapper& \
NetworkSessionCocoa::isolatedSession(WebCore::StoredCredentialsPolicy \
storedCredentialsPolicy, const WebCore::RegistrableDomain firstPartyDomain, \
NavigatingToAppBoundDomain isNavigatingToAppBoundDomain) </ins><span class="cx"> {
</span><del>- auto& entry = m_isolatedSessions.ensure(firstPartyDomain, [this] \
{ </del><ins>+ auto& entry = m_isolatedSessions.ensure(firstPartyDomain, \
[this, isNavigatingToAppBoundDomain] { </ins><span class="cx"> auto newEntry \
= makeUnique<IsolatedSession>(); </span><del>- \
newEntry->sessionWithCredentialStorage.initialize(m_sessionWithCredentialStorage.session.get().configuration, \
*this, WebCore::StoredCredentialsPolicy::Use);
- newEntry->sessionWithoutCredentialStorage.initialize(m_sessionWithoutCredentialStorage.session.get().configuration, \
*this, WebCore::StoredCredentialsPolicy::DoNotUse); </del><ins>+ \
newEntry->sessionWithCredentialStorage.initialize(m_sessionWithCredentialStorage.session.get().configuration, \
*this, WebCore::StoredCredentialsPolicy::Use, isNavigatingToAppBoundDomain); + \
newEntry->sessionWithoutCredentialStorage.initialize(m_sessionWithoutCredentialStorage.session.get().configuration, \
*this, WebCore::StoredCredentialsPolicy::DoNotUse, isNavigatingToAppBoundDomain); \
</ins><span class="cx"> return newEntry; </span><span class="cx"> \
}).iterator->value; </span><span class="cx">
</span><span class="lines">@@ -1279,7 +1282,7 @@
</span><span class="cx"> return \
entry->sessionWithoutCredentialStorage; </span><span class="cx"> case \
WebCore::StoredCredentialsPolicy::EphemeralStateless: </span><span class="cx"> \
if (!m_ephemeralStatelessSession.session) </span><del>- \
initializeEphemeralStatelessSession(); </del><ins>+ \
initializeEphemeralStatelessSession(isNavigatingToAppBoundDomain); </ins><span \
class="cx"> return m_ephemeralStatelessSession; </span><span class="cx"> \
} </span><span class="cx"> } (storedCredentialsPolicy);
</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