Title: [239835] trunk/Source/WebKit
- Revision
- 239835
- Author
- commit-qu...@webkit.org
- Date
- 2019-01-10 11:11:33 -0800 (Thu, 10 Jan 2019)
Log Message
REGRESSION(r239815) http/tests/workers/service/serviceworker-private-browsing.https.html test times out
https://bugs.webkit.org/show_bug.cgi?id=193325
Patch by Alex Christensen <achristen...@webkit.org> on 2019-01-10
Reviewed by Joseph Pecoraro.
InjectedBundle::setPrivateBrowsingEnabled effectively didn't do anything when enabled was false.
I made it destroy the legacy private browsing session in the NetworkProcess, which caused a test to time out.
This functionality is only used for testing, so it's no big deal to revert that part of the patch.
* NetworkProcess/NetworkConnectionToWebProcess.cpp:
(WebKit::NetworkConnectionToWebProcess::destroyLegacyPrivateBrowsingSession): Deleted.
* NetworkProcess/NetworkConnectionToWebProcess.h:
* NetworkProcess/NetworkConnectionToWebProcess.messages.in:
* WebProcess/InjectedBundle/InjectedBundle.cpp:
(WebKit::InjectedBundle::setPrivateBrowsingEnabled):
* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::destroyLegacyPrivateBrowsingSessionInNetworkProcess): Deleted.
* WebProcess/WebProcess.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (239834 => 239835)
--- trunk/Source/WebKit/ChangeLog 2019-01-10 18:47:39 UTC (rev 239834)
+++ trunk/Source/WebKit/ChangeLog 2019-01-10 19:11:33 UTC (rev 239835)
@@ -1,3 +1,24 @@
+2019-01-10 Alex Christensen <achristen...@webkit.org>
+
+ REGRESSION(r239815) http/tests/workers/service/serviceworker-private-browsing.https.html test times out
+ https://bugs.webkit.org/show_bug.cgi?id=193325
+
+ Reviewed by Joseph Pecoraro.
+
+ InjectedBundle::setPrivateBrowsingEnabled effectively didn't do anything when enabled was false.
+ I made it destroy the legacy private browsing session in the NetworkProcess, which caused a test to time out.
+ This functionality is only used for testing, so it's no big deal to revert that part of the patch.
+
+ * NetworkProcess/NetworkConnectionToWebProcess.cpp:
+ (WebKit::NetworkConnectionToWebProcess::destroyLegacyPrivateBrowsingSession): Deleted.
+ * NetworkProcess/NetworkConnectionToWebProcess.h:
+ * NetworkProcess/NetworkConnectionToWebProcess.messages.in:
+ * WebProcess/InjectedBundle/InjectedBundle.cpp:
+ (WebKit::InjectedBundle::setPrivateBrowsingEnabled):
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::destroyLegacyPrivateBrowsingSessionInNetworkProcess): Deleted.
+ * WebProcess/WebProcess.h:
+
2019-01-10 Per Arne Vollan <pvol...@apple.com>
[macOS] Add name of IORegistry key in sandbox.
Modified: trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp (239834 => 239835)
--- trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp 2019-01-10 18:47:39 UTC (rev 239834)
+++ trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp 2019-01-10 19:11:33 UTC (rev 239835)
@@ -554,11 +554,6 @@
m_networkProcess->addWebsiteDataStore(WebsiteDataStoreParameters::legacyPrivateSessionParameters());
}
-void NetworkConnectionToWebProcess::destroyLegacyPrivateBrowsingSession()
-{
- m_networkProcess->destroySession(PAL::SessionID::legacyPrivateSessionID());
-}
-
void NetworkConnectionToWebProcess::removeStorageAccessForFrame(PAL::SessionID sessionID, uint64_t frameID, uint64_t pageID)
{
#if ENABLE(RESOURCE_LOAD_STATISTICS)
Modified: trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h (239834 => 239835)
--- trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h 2019-01-10 18:47:39 UTC (rev 239834)
+++ trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h 2019-01-10 19:11:33 UTC (rev 239835)
@@ -171,7 +171,6 @@
void destroySocketStream(uint64_t);
void ensureLegacyPrivateBrowsingSession();
- void destroyLegacyPrivateBrowsingSession();
#if ENABLE(INDEXED_DATABASE)
// Messages handlers (Modern IDB).
Modified: trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in (239834 => 239835)
--- trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in 2019-01-10 18:47:39 UTC (rev 239834)
+++ trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in 2019-01-10 19:11:33 UTC (rev 239835)
@@ -55,7 +55,6 @@
CreateSocketStream(URL url, PAL::SessionID sessionID, String cachePartition, uint64_t identifier)
EnsureLegacyPrivateBrowsingSession()
- DestroyLegacyPrivateBrowsingSession()
RemoveStorageAccessForFrame(PAL::SessionID sessionID, uint64_t frameID, uint64_t pageID);
RemoveStorageAccessForAllFramesOnPage(PAL::SessionID sessionID, uint64_t pageID);
Modified: trunk/Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.cpp (239834 => 239835)
--- trunk/Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.cpp 2019-01-10 18:47:39 UTC (rev 239834)
+++ trunk/Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.cpp 2019-01-10 19:11:33 UTC (rev 239835)
@@ -356,8 +356,6 @@
ASSERT(!hasProcessPrivilege(ProcessPrivilege::CanAccessRawCookies));
if (enabled)
WebProcess::singleton().ensureLegacyPrivateBrowsingSessionInNetworkProcess();
- else
- WebProcess::singleton().destroyLegacyPrivateBrowsingSessionInNetworkProcess();
const HashSet<Page*>& pages = PageGroup::pageGroup(pageGroup->identifier())->pages();
for (HashSet<Page*>::iterator iter = pages.begin(); iter != pages.end(); ++iter)
Modified: trunk/Source/WebKit/WebProcess/WebProcess.cpp (239834 => 239835)
--- trunk/Source/WebKit/WebProcess/WebProcess.cpp 2019-01-10 18:47:39 UTC (rev 239834)
+++ trunk/Source/WebKit/WebProcess/WebProcess.cpp 2019-01-10 19:11:33 UTC (rev 239835)
@@ -540,11 +540,6 @@
ensureNetworkProcessConnection().connection().send(Messages::NetworkConnectionToWebProcess::EnsureLegacyPrivateBrowsingSession(), 0);
}
-void WebProcess::destroyLegacyPrivateBrowsingSessionInNetworkProcess()
-{
- ensureNetworkProcessConnection().connection().send(Messages::NetworkConnectionToWebProcess::DestroyLegacyPrivateBrowsingSession(), 0);
-}
-
#if ENABLE(NETSCAPE_PLUGIN_API)
PluginProcessConnectionManager& WebProcess::pluginProcessConnectionManager()
{
Modified: trunk/Source/WebKit/WebProcess/WebProcess.h (239834 => 239835)
--- trunk/Source/WebKit/WebProcess/WebProcess.h 2019-01-10 18:47:39 UTC (rev 239834)
+++ trunk/Source/WebKit/WebProcess/WebProcess.h 2019-01-10 19:11:33 UTC (rev 239835)
@@ -178,7 +178,6 @@
void setCacheModel(CacheModel);
void ensureLegacyPrivateBrowsingSessionInNetworkProcess();
- void destroyLegacyPrivateBrowsingSessionInNetworkProcess();
void pageDidEnterWindow(uint64_t pageID);
void pageWillLeaveWindow(uint64_t pageID);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
