Title: [248666] trunk/Source/WebKit
- Revision
- 248666
- Author
- you...@apple.com
- Date
- 2019-08-14 03:13:55 -0700 (Wed, 14 Aug 2019)
Log Message
Make WebSWOriginStore::m_webSWServerConnections a WeakHashSet
https://bugs.webkit.org/show_bug.cgi?id=200661
Reviewed by Alex Christensen.
* NetworkProcess/ServiceWorker/WebSWOriginStore.cpp:
(WebKit::WebSWOriginStore::importComplete):
(WebKit::WebSWOriginStore::registerSWServerConnection):
(WebKit::WebSWOriginStore::unregisterSWServerConnection):
(WebKit::WebSWOriginStore::didInvalidateSharedMemory):
* NetworkProcess/ServiceWorker/WebSWOriginStore.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (248665 => 248666)
--- trunk/Source/WebKit/ChangeLog 2019-08-14 10:11:11 UTC (rev 248665)
+++ trunk/Source/WebKit/ChangeLog 2019-08-14 10:13:55 UTC (rev 248666)
@@ -1,5 +1,19 @@
2019-08-14 Youenn Fablet <you...@apple.com>
+ Make WebSWOriginStore::m_webSWServerConnections a WeakHashSet
+ https://bugs.webkit.org/show_bug.cgi?id=200661
+
+ Reviewed by Alex Christensen.
+
+ * NetworkProcess/ServiceWorker/WebSWOriginStore.cpp:
+ (WebKit::WebSWOriginStore::importComplete):
+ (WebKit::WebSWOriginStore::registerSWServerConnection):
+ (WebKit::WebSWOriginStore::unregisterSWServerConnection):
+ (WebKit::WebSWOriginStore::didInvalidateSharedMemory):
+ * NetworkProcess/ServiceWorker/WebSWOriginStore.h:
+
+2019-08-14 Youenn Fablet <you...@apple.com>
+
NetworkProcess::m_swServerConnections should use WeakPtr
https://bugs.webkit.org/show_bug.cgi?id=200660
Modified: trunk/Source/WebKit/NetworkProcess/ServiceWorker/WebSWOriginStore.cpp (248665 => 248666)
--- trunk/Source/WebKit/NetworkProcess/ServiceWorker/WebSWOriginStore.cpp 2019-08-14 10:11:11 UTC (rev 248665)
+++ trunk/Source/WebKit/NetworkProcess/ServiceWorker/WebSWOriginStore.cpp 2019-08-14 10:13:55 UTC (rev 248666)
@@ -61,13 +61,13 @@
void WebSWOriginStore::importComplete()
{
m_isImported = true;
- for (auto* connection : m_webSWServerConnections)
- connection->send(Messages::WebSWClientConnection::SetSWOriginTableIsImported());
+ for (auto& connection : m_webSWServerConnections)
+ connection.send(Messages::WebSWClientConnection::SetSWOriginTableIsImported());
}
void WebSWOriginStore::registerSWServerConnection(WebSWServerConnection& connection)
{
- m_webSWServerConnections.add(&connection);
+ m_webSWServerConnections.add(connection);
if (!m_store.isEmpty())
sendStoreHandle(connection);
@@ -78,7 +78,7 @@
void WebSWOriginStore::unregisterSWServerConnection(WebSWServerConnection& connection)
{
- m_webSWServerConnections.remove(&connection);
+ m_webSWServerConnections.remove(connection);
}
void WebSWOriginStore::sendStoreHandle(WebSWServerConnection& connection)
@@ -92,8 +92,8 @@
void WebSWOriginStore::didInvalidateSharedMemory()
{
- for (auto* connection : m_webSWServerConnections)
- sendStoreHandle(*connection);
+ for (auto& connection : m_webSWServerConnections)
+ sendStoreHandle(connection);
}
} // namespace WebKit
Modified: trunk/Source/WebKit/NetworkProcess/ServiceWorker/WebSWOriginStore.h (248665 => 248666)
--- trunk/Source/WebKit/NetworkProcess/ServiceWorker/WebSWOriginStore.h 2019-08-14 10:11:11 UTC (rev 248665)
+++ trunk/Source/WebKit/NetworkProcess/ServiceWorker/WebSWOriginStore.h 2019-08-14 10:13:55 UTC (rev 248666)
@@ -29,7 +29,7 @@
#include "SharedStringHashStore.h"
#include <WebCore/SWOriginStore.h>
-#include <wtf/HashSet.h>
+#include <wtf/WeakHashSet.h>
namespace WebKit {
@@ -55,7 +55,7 @@
SharedStringHashStore m_store;
bool m_isImported { false };
- HashSet<WebSWServerConnection*> m_webSWServerConnections;
+ WeakHashSet<WebSWServerConnection> m_webSWServerConnections;
};
} // namespace WebKit
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
