REGRESSION(r239815) http/tests/workers/service/serviceworker-private-browsing.https...
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 10 Jan 2019 19:11:33 +0000 (19:11 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 10 Jan 2019 19:11:33 +0000 (19:11 +0000)
https://bugs.webkit.org/show_bug.cgi?id=193325

Patch by Alex Christensen <achristensen@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:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@239835 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit/ChangeLog
Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp
Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h
Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in
Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.cpp
Source/WebKit/WebProcess/WebProcess.cpp
Source/WebKit/WebProcess/WebProcess.h

index 2d952f0..0f00abc 100644 (file)
@@ -1,3 +1,24 @@
+2019-01-10  Alex Christensen  <achristensen@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  <pvollan@apple.com>
 
         [macOS] Add name of IORegistry key in sandbox.
index cc2f27b..bc19695 100644 (file)
@@ -554,11 +554,6 @@ void NetworkConnectionToWebProcess::ensureLegacyPrivateBrowsingSession()
     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)
index fdf6a4c..e6119b1 100644 (file)
@@ -171,7 +171,6 @@ private:
     void destroySocketStream(uint64_t);
     
     void ensureLegacyPrivateBrowsingSession();
-    void destroyLegacyPrivateBrowsingSession();
 
 #if ENABLE(INDEXED_DATABASE)
     // Messages handlers (Modern IDB).
index 082685c..932b934 100644 (file)
@@ -55,7 +55,6 @@ messages -> NetworkConnectionToWebProcess LegacyReceiver {
     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);
index 44d82fa..1dbbdcf 100644 (file)
@@ -356,8 +356,6 @@ void InjectedBundle::setPrivateBrowsingEnabled(WebPageGroupProxy* pageGroup, boo
     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)
index 57bf9b0..023065c 100644 (file)
@@ -540,11 +540,6 @@ void WebProcess::ensureLegacyPrivateBrowsingSessionInNetworkProcess()
     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()
 {
index 03e2f4a..8a85cdb 100644 (file)
@@ -178,7 +178,6 @@ public:
     void setCacheModel(CacheModel);
 
     void ensureLegacyPrivateBrowsingSessionInNetworkProcess();
-    void destroyLegacyPrivateBrowsingSessionInNetworkProcess();
 
     void pageDidEnterWindow(uint64_t pageID);
     void pageWillLeaveWindow(uint64_t pageID);