Changeset 248780 in webkit

Timestamp:

Aug 16, 2019 11:22:16 AM (5 years ago)

Author:

Chris Dumez

Message:

StorageManager does not need to subclass RefCounted
​https://bugs.webkit.org/show_bug.cgi?id=200818

Reviewed by Geoffrey Garen.

StorageManager does not need to subclass RefCounted. It is owned by the StorageManagerSet
and is never ref'd / deref'd.

• NetworkProcess/WebStorage/StorageManager.h:

(WebKit::StorageManager::create): Deleted.

• NetworkProcess/WebStorage/StorageManagerSet.cpp:

(WebKit::StorageManagerSet::add):

• NetworkProcess/WebStorage/StorageManagerSet.h:

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/WebStorage/StorageManager.h (modified) (2 diffs)
• NetworkProcess/WebStorage/StorageManagerSet.cpp (modified) (1 diff)
• NetworkProcess/WebStorage/StorageManagerSet.h (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-08-16  Chris Dumez  <cdumez@apple.com>
+
+        StorageManager does not need to subclass RefCounted
+        https://bugs.webkit.org/show_bug.cgi?id=200818
+
+        Reviewed by Geoffrey Garen.
+
+        StorageManager does not need to subclass RefCounted. It is owned by the StorageManagerSet
+        and is never ref'd / deref'd.
+
+        * NetworkProcess/WebStorage/StorageManager.h:
+        (WebKit::StorageManager::create): Deleted.
+        * NetworkProcess/WebStorage/StorageManagerSet.cpp:
+        (WebKit::StorageManagerSet::add):
+        * NetworkProcess/WebStorage/StorageManagerSet.h:
+
 2019-08-16  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebKit/NetworkProcess/WebStorage/StorageManager.h

@@ -49 +49 @@
 using GetValuesCallback = CompletionHandler<void(const HashMap<String, String>&)>;
 
-class StorageManager : public RefCounted<StorageManager> {
+class StorageManager {
+    WTF_MAKE_NONCOPYABLE(StorageManager);
+    WTF_MAKE_FAST_ALLOCATED;
 public:
-    static Ref<StorageManager> create(String&& localStorageDirectory)
-    {
-        return adoptRef(*new StorageManager(WTFMove(localStorageDirectory)));
-    }
-    
+    explicit StorageManager(String&& localStorageDirectory);
     ~StorageManager();
 
@@ -85 +83 @@
 
 private:
-    explicit StorageManager(String&& localStorageDirectory);
-
     LocalStorageNamespace* getOrCreateLocalStorageNamespace(uint64_t storageNamespaceID);
     TransientLocalStorageNamespace* getOrCreateTransientLocalStorageNamespace(uint64_t storageNamespaceID, WebCore::SecurityOriginData&& topLevelOrigin);

trunk/Source/WebKit/NetworkProcess/WebStorage/StorageManagerSet.cpp

@@ -65 +65 @@
             SandboxExtension::consumePermanently(localStorageDirectoryHandle);
 
-        m_queue->dispatch([this, protectedThis = makeRef(*this), sessionID, directory = localStorageDirectory.isolatedCopy()]() mutable {
-            m_storageManagers.ensure(sessionID, [directory]() mutable {
-                return StorageManager::create(WTFMove(directory));
+        m_queue->dispatch([this, protectedThis = makeRef(*this), sessionID, localStorageDirectory = localStorageDirectory.isolatedCopy()]() mutable {
+            m_storageManagers.ensure(sessionID, [&]() mutable {
+                return std::make_unique<StorageManager>(WTFMove(localStorageDirectory));
             });
         });

trunk/Source/WebKit/NetworkProcess/WebStorage/StorageManagerSet.h

@@ -85 +85 @@
     void cloneSessionStorageNamespace(IPC::Connection&, PAL::SessionID, uint64_t fromStorageNamespaceID, uint64_t toStorageNamespaceID);
 
-    HashMap<PAL::SessionID, RefPtr<StorageManager>> m_storageManagers;
+    HashMap<PAL::SessionID, std::unique_ptr<StorageManager>> m_storageManagers;
     HashMap<PAL::SessionID, String> m_storageManagerPaths;
     HashMap<uint64_t, StorageArea*> m_storageAreas;