Attachment 358805 Details for Bug 193325 – Patch

[patch] Patch

bug-193325-20190110103239.patch (text/plain), 5.59 KB, created by Alex Christensen on 2019-01-10 10:32:38 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Christensen

Created: 2019-01-10 10:32:38 PST

Size: 5.59 KB

patch

obsolete

>Index: Source/WebKit/ChangeLog
>===================================================================
>--- Source/WebKit/ChangeLog	(revision 239833)
>+++ Source/WebKit/ChangeLog	(working copy)
>@@ -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 NOBODY (OOPS!).
>+
>+        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  John Wilander  <wilander@apple.com>
> 
>         Override the session configuration for cookieAcceptPolicy
>Index: Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp
>===================================================================
>--- Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp	(revision 239831)
>+++ Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp	(working copy)
>@@ -554,11 +554,6 @@ void NetworkConnectionToWebProcess::ensu
>     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: Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h
>===================================================================
>--- Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h	(revision 239831)
>+++ Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h	(working copy)
>@@ -171,7 +171,6 @@ private:
>     void destroySocketStream(uint64_t);
>     
>     void ensureLegacyPrivateBrowsingSession();
>-    void destroyLegacyPrivateBrowsingSession();
> 
> #if ENABLE(INDEXED_DATABASE)
>     // Messages handlers (Modern IDB).
>Index: Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in
>===================================================================
>--- Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in	(revision 239831)
>+++ Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in	(working copy)
>@@ -55,7 +55,6 @@ messages -> NetworkConnectionToWebProces
>     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: Source/WebKit/WebProcess/WebProcess.cpp
>===================================================================
>--- Source/WebKit/WebProcess/WebProcess.cpp	(revision 239831)
>+++ Source/WebKit/WebProcess/WebProcess.cpp	(working copy)
>@@ -540,11 +540,6 @@ void WebProcess::ensureLegacyPrivateBrow
>     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: Source/WebKit/WebProcess/WebProcess.h
>===================================================================
>--- Source/WebKit/WebProcess/WebProcess.h	(revision 239831)
>+++ Source/WebKit/WebProcess/WebProcess.h	(working copy)
>@@ -178,7 +178,6 @@ public:
>     void setCacheModel(CacheModel);
> 
>     void ensureLegacyPrivateBrowsingSessionInNetworkProcess();
>-    void destroyLegacyPrivateBrowsingSessionInNetworkProcess();
> 
>     void pageDidEnterWindow(uint64_t pageID);
>     void pageWillLeaveWindow(uint64_t pageID);
>Index: Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.cpp
>===================================================================
>--- Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.cpp	(revision 239831)
>+++ Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.cpp	(working copy)
>@@ -356,8 +356,6 @@ void InjectedBundle::setPrivateBrowsingE
>     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)

Actions: View | Formatted Diff | Diff

Attachments on bug 193325: 358805