Changeset 247277 in webkit

Timestamp:

Jul 9, 2019 2:01:50 PM (5 years ago)

Author:

Truitt Savell

Message:

Unreviewed, rolling out r247230.

Caused storage/domstorage/localstorage/private-browsing-
affects-storage.html to crash with an assertion.

Reverted changeset:

"Cleanup uses of NetworkProcess::m_sessionByConnection"
​https://bugs.webkit.org/show_bug.cgi?id=199586
​https://trac.webkit.org/changeset/247230

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/NetworkProcess.cpp (modified) (3 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-07-09  Truitt Savell  <tsavell@apple.com>
+
+        Unreviewed, rolling out r247230.
+
+        Caused storage/domstorage/localstorage/private-browsing-
+        affects-storage.html to crash with an assertion.
+
+        Reverted changeset:
+
+        "Cleanup uses of NetworkProcess::m_sessionByConnection"
+        https://bugs.webkit.org/show_bug.cgi?id=199586
+        https://trac.webkit.org/changeset/247230
+
 2019-07-09  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp

@@ -573 +573 @@
 NetworkSession* NetworkProcess::networkSessionByConnection(IPC::Connection& connection) const
 {
-    auto sessionID = m_sessionByConnection.get(connection.uniqueID());
-    return sessionID.isValid() ? networkSession(sessionID) : nullptr;
+    if (!m_sessionByConnection.contains(connection.uniqueID()))
+        return nullptr;
+
+    return networkSession(m_sessionByConnection.get(connection.uniqueID()));
 }
 
@@ -2672 +2674 @@
     auto& storageManager = session->storageManager();
 
-    auto addResult = m_sessionByConnection.add(connection.uniqueID(), sessionID);
-    ASSERT_UNUSED(addResult, addResult.iterator->value == sessionID);
+    auto connectionID = connection.uniqueID();
+    m_sessionByConnection.ensure(connectionID, [&]() {
+        return sessionID;
+    });
 
     storageManager.createSessionStorageNamespace(pageID.toUInt64(), std::numeric_limits<unsigned>::max());
@@ -2700 +2704 @@
 void NetworkProcess::webProcessWasDisconnected(IPC::Connection& connection)
 {
-    auto sessionID = m_sessionByConnection.take(connection.uniqueID());
-    if (!sessionID.isValid())
-        return;
-
+    auto connectionID = connection.uniqueID();
+    if (!m_sessionByConnection.contains(connectionID))
+        return;
+
+    auto sessionID = m_sessionByConnection.take(connectionID);
     if (auto* session = networkSession(sessionID))
         session->storageManager().processDidCloseConnection(connection);