Changeset 259539 in webkit

Timestamp:

Apr 4, 2020 4:44:55 PM (4 years ago)

Author:

ddkilzer@apple.com

Message:

[GPUP] Remove unnecessary RemoteCDMInstanceSessionIdentifier argument from RemoteCDMFactory::addSession()
<​https://webkit.org/b/210006>

Reviewed by Darin Adler.

• WebProcess/GPU/media/RemoteCDMFactory.cpp:

(WebKit::RemoteCDMFactory::addSession):

• Remove argument. Use session parameter to retrieve the ID.
• WebProcess/GPU/media/RemoteCDMFactory.h:

(WebKit::RemoteCDMFactory::addSession):

• Remove argument.
• WebProcess/GPU/media/RemoteCDMInstance.cpp:

(WebKit::RemoteCDMInstance::createSession):

• Remove argument.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/GPU/media/RemoteCDMFactory.cpp (modified) (1 diff)
• WebProcess/GPU/media/RemoteCDMFactory.h (modified) (1 diff)
• WebProcess/GPU/media/RemoteCDMInstance.cpp (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-04-04  David Kilzer  <ddkilzer@apple.com>
+
+        [GPUP] Remove unnecessary RemoteCDMInstanceSessionIdentifier argument from RemoteCDMFactory::addSession()
+        <https://webkit.org/b/210006>
+
+        Reviewed by Darin Adler.
+
+        * WebProcess/GPU/media/RemoteCDMFactory.cpp:
+        (WebKit::RemoteCDMFactory::addSession):
+        - Remove argument. Use `session` parameter to retrieve the ID.
+        * WebProcess/GPU/media/RemoteCDMFactory.h:
+        (WebKit::RemoteCDMFactory::addSession):
+        - Remove argument.
+        * WebProcess/GPU/media/RemoteCDMInstance.cpp:
+        (WebKit::RemoteCDMInstance::createSession):
+        - Remove argument.
+
 2020-04-04  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Source/WebKit/WebProcess/GPU/media/RemoteCDMFactory.cpp

@@ -79 +79 @@
 }
 
-void RemoteCDMFactory::addSession(RemoteCDMInstanceSessionIdentifier id, Ref<RemoteCDMInstanceSession>&& session)
+void RemoteCDMFactory::addSession(Ref<RemoteCDMInstanceSession>&& session)
 {
-    ASSERT(!m_sessions.contains(id));
-    m_sessions.set(id, WTFMove(session));
+    ASSERT(!m_sessions.contains(session->identifier()));
+    m_sessions.set(session->identifier(), WTFMove(session));
 }
 

trunk/Source/WebKit/WebProcess/GPU/media/RemoteCDMFactory.h

@@ -69 +69 @@
     void didReceiveSessionMessage(IPC::Connection&, IPC::Decoder&);
 
-    void addSession(RemoteCDMInstanceSessionIdentifier, Ref<RemoteCDMInstanceSession>&&);
+    void addSession(Ref<RemoteCDMInstanceSession>&&);
     void removeSession(RemoteCDMInstanceSessionIdentifier);
 

trunk/Source/WebKit/WebProcess/GPU/media/RemoteCDMInstance.cpp

@@ -92 +92 @@
         return nullptr;
     auto session = RemoteCDMInstanceSession::create(makeWeakPtr(m_factory.get()), WTFMove(id));
-    m_factory->addSession(session->identifier(), session.copyRef());
+    m_factory->addSession(session.copyRef());
     return session;
 }