Changeset 247283 in webkit

Timestamp:

Jul 9, 2019 3:40:08 PM (5 years ago)

Author:

Chris Dumez

Message:

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

Reviewed by Alex Christensen.

Avoid double HashMap lookups and call add() instead of ensure() when appropriate.

• NetworkProcess/NetworkProcess.cpp:

(WebKit::NetworkProcess::networkSessionByConnection const):
(WebKit::NetworkProcess::webPageWasAdded):
(WebKit::NetworkProcess::webProcessWasDisconnected):

Location:

trunk/Source

Files:

• WebCore/page/PageGroup.cpp (modified) (2 diffs)
• WebCore/page/PageGroup.h (modified) (2 diffs)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/NetworkProcess/NetworkProcess.cpp (modified) (3 diffs)
• WebKit/WebProcess/InjectedBundle/InjectedBundle.cpp (modified) (1 diff)

trunk/Source/WebCore/page/PageGroup.cpp

@@ -94 +94 @@
     ASSERT(!m_pages.contains(&page));
     m_pages.add(&page);
+    
+    if (m_isLegacyPrivateBrowsingEnabledForTesting)
+        page.enableLegacyPrivateBrowsing(true);
 }
 
@@ -124 +127 @@
 #endif
 
+void PageGroup::enableLegacyPrivateBrowsingForTesting(bool enabled)
+{
+    if (m_isLegacyPrivateBrowsingEnabledForTesting == enabled)
+        return;
+
+    m_isLegacyPrivateBrowsingEnabledForTesting = enabled;
+    
+    for (auto* page : m_pages)
+        page->enableLegacyPrivateBrowsing(enabled);
+}
+
 } // namespace WebCore

trunk/Source/WebCore/page/PageGroup.h

@@ -59 +59 @@
 #endif
 
+    WEBCORE_EXPORT void enableLegacyPrivateBrowsingForTesting(bool);
+
 private:
     String m_name;
@@ -68 +70 @@
     std::unique_ptr<CaptionUserPreferences> m_captionPreferences;
 #endif
+
+    bool m_isLegacyPrivateBrowsingEnabledForTesting { false };
 };
 

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-07-09  Chris Dumez  <cdumez@apple.com>
+
+        Cleanup uses of NetworkProcess::m_sessionByConnection
+        https://bugs.webkit.org/show_bug.cgi?id=199586
+
+        Reviewed by Alex Christensen.
+
+        Avoid double HashMap lookups and call add() instead of ensure() when appropriate.
+
+        * NetworkProcess/NetworkProcess.cpp:
+        (WebKit::NetworkProcess::networkSessionByConnection const):
+        (WebKit::NetworkProcess::webPageWasAdded):
+        (WebKit::NetworkProcess::webProcessWasDisconnected):
+
 2019-07-09  Saagar Jha  <saagarjha@apple.com>
 

trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp

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

trunk/Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.cpp

@@ -351 +351 @@
     WebProcess::singleton().enablePrivateBrowsingForTesting(enabled);
 
-    const HashSet<Page*>& pages = PageGroup::pageGroup(pageGroup->identifier())->pages();
-    for (HashSet<Page*>::iterator iter = pages.begin(); iter != pages.end(); ++iter)
-        (*iter)->enableLegacyPrivateBrowsing(enabled);
+    PageGroup::pageGroup(pageGroup->identifier())->enableLegacyPrivateBrowsingForTesting(enabled);
 }