Changeset 247370 in webkit

Timestamp:

Jul 11, 2019, 3:26:25 PM (6 years ago)

Author:

sihui_liu@apple.com

Message:

StorageArea should not be destructed on the main thread
​https://bugs.webkit.org/show_bug.cgi?id=199713
<rdar://problem/52911900>

Reviewed by Alex Christensen.

After r246079, LocalStorageNameSpace could be destructed on the main thread and it may hold the last reference
to StorageArea. Then we saw the crashes that StorageArea was wrongly destructed on the main thread.

• NetworkProcess/NetworkSession.cpp:

(WebKit::NetworkSession::~NetworkSession):

• NetworkProcess/WebStorage/StorageManager.cpp:

(WebKit::StorageManager::waitUntilTasksFinished):
(WebKit::StorageManager::waitUntilWritesFinished): Deleted.

• NetworkProcess/WebStorage/StorageManager.h:

Location:

trunk/Source/WebKit

Files:

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

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-07-11  Sihui Liu  <sihui_liu@apple.com>
+
+        StorageArea should not be destructed on the main thread
+        https://bugs.webkit.org/show_bug.cgi?id=199713
+        <rdar://problem/52911900>
+
+        Reviewed by Alex Christensen.
+
+        After r246079, LocalStorageNameSpace could be destructed on the main thread and it may hold the last reference 
+        to StorageArea. Then we saw the crashes that StorageArea was wrongly destructed on the main thread.
+
+        * NetworkProcess/NetworkSession.cpp:
+        (WebKit::NetworkSession::~NetworkSession):
+        * NetworkProcess/WebStorage/StorageManager.cpp:
+        (WebKit::StorageManager::waitUntilTasksFinished):
+        (WebKit::StorageManager::waitUntilWritesFinished): Deleted.
+        * NetworkProcess/WebStorage/StorageManager.h:
+
 2019-07-11  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebKit/NetworkProcess/NetworkSession.cpp

@@ -96 +96 @@
 {
     m_storageManager->resume();
-    m_storageManager->waitUntilWritesFinished();
+    m_storageManager->waitUntilTasksFinished();
 }
 

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

@@ -908 +908 @@
 }
 
-void StorageManager::waitUntilWritesFinished()
+void StorageManager::waitUntilTasksFinished()
 {
     BinarySemaphore semaphore;
@@ -921 +921 @@
             m_storageAreasByConnection.remove(connectionStorageAreaPair);
 
+        m_localStorageNamespaces.clear();
+
         semaphore.signal();
     });

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

@@ -58 +58 @@
 
     void processDidCloseConnection(IPC::Connection&);
-    void waitUntilWritesFinished();
+    void waitUntilTasksFinished();
     void suspend(CompletionHandler<void()>&&);
     void resume();