Changeset 187297 in webkit

Timestamp:

Jul 23, 2015, 11:24:35 PM (11 years ago)

Author:

Lucas Forschler

Message:

Merged r187115. rdar://problem/21838764

Location:

branches/safari-601.1-branch/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/APISession.cpp (modified) (2 diffs)

branches/safari-601.1-branch/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-07-23  Lucas Forschler  <lforschler@apple.com>
+
+        Merge r187115
+
+    2015-07-21  Andreas Kling  <akling@apple.com>
+
+            API::Session should clean up its storage in the network process when destroyed.
+            <https://webkit.org/b/147139>
+            <rdar://problem/21838764>
+
+            Reviewed by Anders Carlsson.
+
+            Have ~Session() send a DestroyPrivateBrowsingSession message to all networking processes
+            for ephemeral sessions. This plugs a NetworkStorageSession leak that could retain a large
+            CFNetwork object graph.
+
+            * UIProcess/API/APISession.cpp:
+            (API::Session::~Session):
+
 2015-07-23  Lucas Forschler  <lforschler@apple.com>
 

branches/safari-601.1-branch/Source/WebKit2/UIProcess/API/APISession.cpp

@@ -28 +28 @@
 
 #include <wtf/RunLoop.h>
+
+#if ENABLE(NETWORK_PROCESS)
+#include "NetworkProcessMessages.h"
+#include "WebProcessPool.h"
+#endif
 
 namespace API {
@@ -76 +81 @@
 Session::~Session()
 {
+#if ENABLE(NETWORK_PROCESS)
+    if (m_sessionID.isEphemeral()) {
+        for (auto& processPool : WebKit::WebProcessPool::allProcessPools())
+            processPool->sendToNetworkingProcess(Messages::NetworkProcess::DestroyPrivateBrowsingSession(m_sessionID));
+    }
+#endif
 }