Diff
Modified: branches/safari-605-branch/Source/WebKit/ChangeLog (227704 => 227705)
--- branches/safari-605-branch/Source/WebKit/ChangeLog 2018-01-27 01:25:56 UTC (rev 227704)
+++ branches/safari-605-branch/Source/WebKit/ChangeLog 2018-01-27 01:26:00 UTC (rev 227705)
@@ -1,3 +1,25 @@
+2018-01-26 Jason Marcell <[email protected]>
+
+ Cherry-pick r227687. rdar://problem/36873343
+
+ 2018-01-26 Alex Christensen <[email protected]>
+
+ Allow cellular access for default-created ephemeral sessions
+ https://bugs.webkit.org/show_bug.cgi?id=182179
+ <rdar://problem/36572023>
+
+ Reviewed by Andy Estes.
+
+ This makes it so when we recover from a NetworkProcess crash (see r227590) on iOS, we will
+ be able to continue browsing using cell data.
+
+ * Shared/WebsiteDataStoreParameters.cpp:
+ (WebKit::WebsiteDataStoreParameters::privateSessionParameters):
+ * UIProcess/WebProcessPool.cpp:
+ (WebKit::WebProcessPool::pageBeginUsingWebsiteDataStore):
+ * WebProcess/InjectedBundle/InjectedBundle.cpp:
+ (WebKit::InjectedBundle::setPrivateBrowsingEnabled):
+
2018-01-25 Jason Marcell <[email protected]>
Cherry-pick r227590. rdar://problem/36873343
Modified: branches/safari-605-branch/Source/WebKit/Shared/WebsiteDataStoreParameters.cpp (227704 => 227705)
--- branches/safari-605-branch/Source/WebKit/Shared/WebsiteDataStoreParameters.cpp 2018-01-27 01:25:56 UTC (rev 227704)
+++ branches/safari-605-branch/Source/WebKit/Shared/WebsiteDataStoreParameters.cpp 2018-01-27 01:26:00 UTC (rev 227705)
@@ -89,7 +89,7 @@
WebsiteDataStoreParameters WebsiteDataStoreParameters::privateSessionParameters(PAL::SessionID sessionID)
{
ASSERT(sessionID.isEphemeral());
- return { { }, { }, { }, { }, WebsiteDataStore::defaultCacheStoragePerOriginQuota, { }, { sessionID, { }, { }, { }}};
+ return { { }, { }, { }, { }, WebsiteDataStore::defaultCacheStoragePerOriginQuota, { }, { sessionID, { }, { }, AllowsCellularAccess::Yes }};
}
} // namespace WebKit
Modified: branches/safari-605-branch/Source/WebKit/UIProcess/WebProcessPool.cpp (227704 => 227705)
--- branches/safari-605-branch/Source/WebKit/UIProcess/WebProcessPool.cpp 2018-01-27 01:25:56 UTC (rev 227704)
+++ branches/safari-605-branch/Source/WebKit/UIProcess/WebProcessPool.cpp 2018-01-27 01:26:00 UTC (rev 227705)
@@ -1059,7 +1059,7 @@
if (sessionID.isEphemeral()) {
ASSERT(page.websiteDataStore().parameters().networkSessionParameters.sessionID == sessionID);
sendToNetworkingProcess(Messages::NetworkProcess::AddWebsiteDataStore(page.websiteDataStore().parameters()));
- page.process().send(Messages::WebProcess::AddWebsiteDataStore({{ }, { }, { }, { }, { }, { }, { sessionID, { }, { }, { }}}), 0);
+ page.process().send(Messages::WebProcess::AddWebsiteDataStore(WebsiteDataStoreParameters::privateSessionParameters(sessionID)), 0);
} else if (sessionID != PAL::SessionID::defaultSessionID()) {
sendToNetworkingProcess(Messages::NetworkProcess::AddWebsiteDataStore(page.websiteDataStore().parameters()));
page.process().send(Messages::WebProcess::AddWebsiteDataStore(page.websiteDataStore().parameters()), 0);
Modified: branches/safari-605-branch/Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.cpp (227704 => 227705)
--- branches/safari-605-branch/Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.cpp 2018-01-27 01:25:56 UTC (rev 227704)
+++ branches/safari-605-branch/Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.cpp 2018-01-27 01:26:00 UTC (rev 227705)
@@ -331,7 +331,7 @@
{
if (enabled) {
WebProcess::singleton().ensureLegacyPrivateBrowsingSessionInNetworkProcess();
- WebFrameNetworkingContext::ensureWebsiteDataStoreSession({ { }, { }, { }, { }, { }, { }, { PAL::SessionID::legacyPrivateSessionID(), { }, { }, AllowsCellularAccess::Yes }});
+ WebFrameNetworkingContext::ensureWebsiteDataStoreSession(WebsiteDataStoreParameters::legacyPrivateSessionParameters());
} else
SessionTracker::destroySession(PAL::SessionID::legacyPrivateSessionID());
