Title: [259539] trunk/Source/WebKit
- Revision
- 259539
- Author
- [email protected]
- Date
- 2020-04-04 16:44:55 -0700 (Sat, 04 Apr 2020)
Log 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.
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (259538 => 259539)
--- trunk/Source/WebKit/ChangeLog 2020-04-04 22:39:18 UTC (rev 259538)
+++ trunk/Source/WebKit/ChangeLog 2020-04-04 23:44:55 UTC (rev 259539)
@@ -1,3 +1,20 @@
+2020-04-04 David Kilzer <[email protected]>
+
+ [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 <[email protected]>
Add even more logging to try and diagnose <webkit.org/b/209685>
Modified: trunk/Source/WebKit/WebProcess/GPU/media/RemoteCDMFactory.cpp (259538 => 259539)
--- trunk/Source/WebKit/WebProcess/GPU/media/RemoteCDMFactory.cpp 2020-04-04 22:39:18 UTC (rev 259538)
+++ trunk/Source/WebKit/WebProcess/GPU/media/RemoteCDMFactory.cpp 2020-04-04 23:44:55 UTC (rev 259539)
@@ -78,10 +78,10 @@
return RemoteCDM::create(makeWeakPtr(this), WTFMove(id), WTFMove(configuration));
}
-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));
}
void RemoteCDMFactory::removeSession(RemoteCDMInstanceSessionIdentifier id)
Modified: trunk/Source/WebKit/WebProcess/GPU/media/RemoteCDMFactory.h (259538 => 259539)
--- trunk/Source/WebKit/WebProcess/GPU/media/RemoteCDMFactory.h 2020-04-04 22:39:18 UTC (rev 259538)
+++ trunk/Source/WebKit/WebProcess/GPU/media/RemoteCDMFactory.h 2020-04-04 23:44:55 UTC (rev 259539)
@@ -68,7 +68,7 @@
void didReceiveSessionMessage(IPC::Connection&, IPC::Decoder&);
- void addSession(RemoteCDMInstanceSessionIdentifier, Ref<RemoteCDMInstanceSession>&&);
+ void addSession(Ref<RemoteCDMInstanceSession>&&);
void removeSession(RemoteCDMInstanceSessionIdentifier);
private:
Modified: trunk/Source/WebKit/WebProcess/GPU/media/RemoteCDMInstance.cpp (259538 => 259539)
--- trunk/Source/WebKit/WebProcess/GPU/media/RemoteCDMInstance.cpp 2020-04-04 22:39:18 UTC (rev 259538)
+++ trunk/Source/WebKit/WebProcess/GPU/media/RemoteCDMInstance.cpp 2020-04-04 23:44:55 UTC (rev 259539)
@@ -91,7 +91,7 @@
if (!id)
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;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
