Changeset 276571 in webkit

Timestamp:

Apr 25, 2021, 1:38:23 PM (5 years ago)

Author:

jer.noble@apple.com

Message:

[GPUP] REGRESSION: Selecting play/pause on Spotify.com causes page to reload
​https://bugs.webkit.org/show_bug.cgi?id=225023
<rdar://76985997>

Reviewed by Darin Adler.

A zero ObjectIdentifier is apparently invalid, which causes a debug ASSERT on the sending
side and a SIGKILL on the receiving side. Replace the zero ObjectIdentifier message when
clearing a LegacyCDMSession with an Optional<ObjectIdentifier>, and send an explicit
WTF::nullopt when clearing.

• GPUProcess/media/RemoteMediaPlayerProxy.cpp:

(WebKit::RemoteMediaPlayerProxy::mediaPlayerCachedKeyForKeyId const):
(WebKit::RemoteMediaPlayerProxy::setLegacyCDMSession):

• GPUProcess/media/RemoteMediaPlayerProxy.h:
• GPUProcess/media/RemoteMediaPlayerProxy.messages.in:
• WebProcess/GPU/media/MediaPlayerPrivateRemote.cpp:

(WebKit::MediaPlayerPrivateRemote::setCDMSession):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• GPUProcess/media/RemoteMediaPlayerProxy.cpp (modified) (4 diffs)
• GPUProcess/media/RemoteMediaPlayerProxy.h (modified) (2 diffs)
• GPUProcess/media/RemoteMediaPlayerProxy.messages.in (modified) (1 diff)
• WebProcess/GPU/media/MediaPlayerPrivateRemote.cpp (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-04-25  Jer Noble  <jer.noble@apple.com>
+
+        [GPUP] REGRESSION: Selecting play/pause on Spotify.com causes page to reload
+        https://bugs.webkit.org/show_bug.cgi?id=225023
+        <rdar://76985997>
+
+        Reviewed by Darin Adler.
+
+        A zero ObjectIdentifier is apparently invalid, which causes a debug ASSERT on the sending
+        side and a SIGKILL on the receiving side. Replace the zero ObjectIdentifier message when
+        clearing a LegacyCDMSession with an Optional<ObjectIdentifier>, and send an explicit
+        WTF::nullopt when clearing.
+
+        * GPUProcess/media/RemoteMediaPlayerProxy.cpp:
+        (WebKit::RemoteMediaPlayerProxy::mediaPlayerCachedKeyForKeyId const):
+        (WebKit::RemoteMediaPlayerProxy::setLegacyCDMSession):
+        * GPUProcess/media/RemoteMediaPlayerProxy.h:
+        * GPUProcess/media/RemoteMediaPlayerProxy.messages.in:
+        * WebProcess/GPU/media/MediaPlayerPrivateRemote.cpp:
+        (WebKit::MediaPlayerPrivateRemote::setCDMSession):
+
 2021-04-25  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebKit/GPUProcess/media/RemoteMediaPlayerProxy.cpp

@@ -653 +653 @@
         return nullptr;
 
-    if (auto cdmSession = m_manager->gpuConnectionToWebProcess()->legacyCdmFactoryProxy().getSession(m_legacySession))
+    if (auto cdmSession = m_manager->gpuConnectionToWebProcess()->legacyCdmFactoryProxy().getSession(*m_legacySession))
         return cdmSession->getCachedKeyForKeyId(keyId);
     return nullptr;
@@ -848 +848 @@
 
 #if ENABLE(LEGACY_ENCRYPTED_MEDIA)
-void RemoteMediaPlayerProxy::setLegacyCDMSession(RemoteLegacyCDMSessionIdentifier&& instanceId)
+void RemoteMediaPlayerProxy::setLegacyCDMSession(Optional<RemoteLegacyCDMSessionIdentifier>&& instanceId)
 {
     ASSERT(m_manager && m_manager->gpuConnectionToWebProcess());
@@ -858 +858 @@
 
     if (m_legacySession) {
-        if (auto cdmSession = m_manager->gpuConnectionToWebProcess()->legacyCdmFactoryProxy().getSession(m_legacySession)) {
+        if (auto cdmSession = m_manager->gpuConnectionToWebProcess()->legacyCdmFactoryProxy().getSession(*m_legacySession)) {
             m_player->setCDMSession(nullptr);
             cdmSession->setPlayer(nullptr);
@@ -867 +867 @@
 
     if (m_legacySession) {
-        if (auto cdmSession = m_manager->gpuConnectionToWebProcess()->legacyCdmFactoryProxy().getSession(m_legacySession)) {
+        if (auto cdmSession = m_manager->gpuConnectionToWebProcess()->legacyCdmFactoryProxy().getSession(*m_legacySession)) {
             m_player->setCDMSession(cdmSession->session());
             cdmSession->setPlayer(makeWeakPtr(this));

trunk/Source/WebKit/GPUProcess/media/RemoteMediaPlayerProxy.h

@@ -158 +158 @@
 
 #if ENABLE(LEGACY_ENCRYPTED_MEDIA)
-    void setLegacyCDMSession(RemoteLegacyCDMSessionIdentifier&& instanceId);
+    void setLegacyCDMSession(Optional<RemoteLegacyCDMSessionIdentifier>&& instanceId);
     void keyAdded();
 #endif
@@ -330 +330 @@
 #if ENABLE(LEGACY_ENCRYPTED_MEDIA) && ENABLE(ENCRYPTED_MEDIA)
     bool m_shouldContinueAfterKeyNeeded { false };
-    RemoteLegacyCDMSessionIdentifier m_legacySession;
+    Optional<RemoteLegacyCDMSessionIdentifier> m_legacySession;
 #endif
 

trunk/Source/WebKit/GPUProcess/media/RemoteMediaPlayerProxy.messages.in

@@ -77 +77 @@
 
 #if ENABLE(LEGACY_ENCRYPTED_MEDIA)
-    SetLegacyCDMSession(WebKit::RemoteLegacyCDMSessionIdentifier instanceId)
+    SetLegacyCDMSession(Optional<WebKit::RemoteLegacyCDMSessionIdentifier> instanceId)
     KeyAdded()
 #endif

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

@@ -1057 +1057 @@
 {
     if (!session || session->type() != CDMSessionTypeRemote) {
-        connection().send(Messages::RemoteMediaPlayerProxy::SetLegacyCDMSession({ }), m_id);
+        connection().send(Messages::RemoteMediaPlayerProxy::SetLegacyCDMSession(WTF::nullopt), m_id);
         return;
     }