Title: [255493] releases/WebKitGTK/webkit-2.26/Source/WebKit
Revision
255493
Author
carlo...@webkit.org
Date
2020-01-31 06:42:54 -0800 (Fri, 31 Jan 2020)

Log Message

Merge r249802 - [GTK] Allow CacheStore::destroyEngine to destroy default engine for soup.
https://bugs.webkit.org/show_bug.cgi?id=201690

Reviewed by Carlos Garcia Campos.

* NetworkProcess/cache/CacheStorageEngine.cpp:
(WebKit::CacheStorage::Engine::destroyEngine): As we do for
NetworkProcess::destroySession, also allow destroying the engine
for the default session for the same reason.

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.26/Source/WebKit/ChangeLog (255492 => 255493)


--- releases/WebKitGTK/webkit-2.26/Source/WebKit/ChangeLog	2020-01-31 14:40:45 UTC (rev 255492)
+++ releases/WebKitGTK/webkit-2.26/Source/WebKit/ChangeLog	2020-01-31 14:42:54 UTC (rev 255493)
@@ -1,3 +1,15 @@
+2019-09-12  Charlie Turner  <ctur...@igalia.com>
+
+        [GTK] Allow CacheStore::destroyEngine to destroy default engine for soup.
+        https://bugs.webkit.org/show_bug.cgi?id=201690
+
+        Reviewed by Carlos Garcia Campos.
+
+        * NetworkProcess/cache/CacheStorageEngine.cpp:
+        (WebKit::CacheStorage::Engine::destroyEngine): As we do for
+        NetworkProcess::destroySession, also allow destroying the engine
+        for the default session for the same reason.
+
 2019-12-16  Emilio Cobos Álvarez  <emi...@crisal.io>
 
         [GTK] Build with USE_WPE_RENDERER=No fails with undefined EGL_WAYLAND_BUFFER_WL

Modified: releases/WebKitGTK/webkit-2.26/Source/WebKit/NetworkProcess/cache/CacheStorageEngine.cpp (255492 => 255493)


--- releases/WebKitGTK/webkit-2.26/Source/WebKit/NetworkProcess/cache/CacheStorageEngine.cpp	2020-01-31 14:40:45 UTC (rev 255492)
+++ releases/WebKitGTK/webkit-2.26/Source/WebKit/NetworkProcess/cache/CacheStorageEngine.cpp	2020-01-31 14:42:54 UTC (rev 255493)
@@ -89,7 +89,12 @@
 
 void Engine::destroyEngine(NetworkProcess& networkProcess, PAL::SessionID sessionID)
 {
+#if !USE(SOUP)
+    // Soup based ports destroy the default session right before the process exits to avoid leaking
+    // network resources like the cookies database.
     ASSERT(sessionID != PAL::SessionID::defaultSessionID());
+#endif
+
     networkProcess.removeCacheEngine(sessionID);
 }
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to