Changeset 276437 in webkit

Timestamp:

Apr 22, 2021, 9:04:13 AM (4 years ago)

Author:

Chris Dumez

Message:

Call RemoteCDMFactory::registerFactory() in WebProcess::setUseGPUProcessForMedia()
​https://bugs.webkit.org/show_bug.cgi?id=224907

Reviewed by Eric Carlson.

Call RemoteCDMFactory::registerFactory() in WebProcess::setUseGPUProcessForMedia() like we
did before r275887, instead of doing it in the GPUProcessConnection constructor. This is
safer as it makes sure the CDMFactory gets registered even if the GPUProcess has not launched
yet. This is also more consistent with what we do for LegacyCDM since Bug 224905.

The MediaKeys API still seems functional after r275887 (unlike the LegacyCDM one) so it does
not seem it caused obvious breakage. That said, it is still safer to restore pre-r275887
behavior. There is also no drawback to restoring the previous behavior since I made sure the
GPUProcess does not get launched eagerly.

• WebProcess/GPU/GPUProcessConnection.cpp:

(WebKit::GPUProcessConnection::GPUProcessConnection):
(WebKit::GPUProcessConnection::dispatchMessage):

• WebProcess/GPU/GPUProcessConnection.h:
• WebProcess/WebProcess.cpp:

(WebKit::WebProcess::setUseGPUProcessForMedia):
(WebKit::WebProcess::cdmFactory):

• WebProcess/WebProcess.h:

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/GPU/GPUProcessConnection.cpp (modified) (3 diffs)
• WebProcess/GPU/GPUProcessConnection.h (modified) (2 diffs)
• WebProcess/WebProcess.cpp (modified) (2 diffs)
• WebProcess/WebProcess.h (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-04-22  Chris Dumez  <cdumez@apple.com>
+
+        Call RemoteCDMFactory::registerFactory() in WebProcess::setUseGPUProcessForMedia()
+        https://bugs.webkit.org/show_bug.cgi?id=224907
+
+        Reviewed by Eric Carlson.
+
+        Call RemoteCDMFactory::registerFactory() in WebProcess::setUseGPUProcessForMedia() like we
+        did before r275887, instead of doing it in the GPUProcessConnection constructor. This is
+        safer as it makes sure the CDMFactory gets registered even if the GPUProcess has not launched
+        yet. This is also more consistent with what we do for LegacyCDM since Bug 224905.
+
+        The MediaKeys API still seems functional after r275887 (unlike the LegacyCDM one) so it does
+        not seem it caused obvious breakage. That said, it is still safer to restore pre-r275887
+        behavior. There is also no drawback to restoring the previous behavior since I made sure the
+        GPUProcess does not get launched eagerly.
+
+        * WebProcess/GPU/GPUProcessConnection.cpp:
+        (WebKit::GPUProcessConnection::GPUProcessConnection):
+        (WebKit::GPUProcessConnection::dispatchMessage):
+        * WebProcess/GPU/GPUProcessConnection.h:
+        * WebProcess/WebProcess.cpp:
+        (WebKit::WebProcess::setUseGPUProcessForMedia):
+        (WebKit::WebProcess::cdmFactory):
+        * WebProcess/WebProcess.h:
+
 2021-04-22  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebKit/WebProcess/GPU/GPUProcessConnection.cpp

@@ -102 +102 @@
 
     if (WebProcess::singleton().shouldUseRemoteRenderingFor(RenderingPurpose::MediaPainting)) {
-#if ENABLE(ENCRYPTED_MEDIA)
-        auto& cdmFactories = CDMFactory::registeredFactories();
-        cdmFactories.clear();
-        cdmFactory().registerFactory(cdmFactories);
-#endif
         mediaEngineConfigurationFactory().registerFactory();
 #if ENABLE(VP9)
@@ -161 +156 @@
 #endif
 
-#if ENABLE(ENCRYPTED_MEDIA)
-RemoteCDMFactory& GPUProcessConnection::cdmFactory()
-{
-    return *WebProcess::singleton().supplement<RemoteCDMFactory>();
-}
-#endif
-
 RemoteMediaEngineConfigurationFactory& GPUProcessConnection::mediaEngineConfigurationFactory()
 {
@@ -195 +183 @@
 #if ENABLE(ENCRYPTED_MEDIA)
     if (decoder.messageReceiverName() == Messages::RemoteCDMInstanceSession::messageReceiverName()) {
-        WebProcess::singleton().supplement<RemoteCDMFactory>()->didReceiveSessionMessage(connection, decoder);
+        WebProcess::singleton().cdmFactory().didReceiveSessionMessage(connection, decoder);
         return true;
     }

trunk/Source/WebKit/WebProcess/GPU/GPUProcessConnection.h

@@ -41 +41 @@
 
 class RemoteAudioSourceProviderManager;
-class RemoteCDMFactory;
 class RemoteMediaEngineConfigurationFactory;
 class RemoteMediaPlayerManager;
@@ -71 +70 @@
 #if PLATFORM(COCOA) && ENABLE(WEB_AUDIO)
     RemoteAudioSourceProviderManager& audioSourceProviderManager();
-#endif
-
-#if ENABLE(ENCRYPTED_MEDIA)
-    RemoteCDMFactory& cdmFactory();
 #endif
 

trunk/Source/WebKit/WebProcess/WebProcess.cpp

@@ -1972 +1972 @@
 
 #if ENABLE(ENCRYPTED_MEDIA)
-    if (!useGPUProcessForMedia) {
-        auto& cdmFactories = CDMFactory::registeredFactories();
-        cdmFactories.clear();
+    auto& cdmFactories = CDMFactory::registeredFactories();
+    cdmFactories.clear();
+    if (useGPUProcessForMedia)
+        cdmFactory().registerFactory(cdmFactories);
+    else
         CDMFactory::platformRegisterFactories(cdmFactories);
-    }
 #endif
 
@@ -2079 +2080 @@
 #endif
 
+#if ENABLE(GPU_PROCESS) && ENABLE(ENCRYPTED_MEDIA)
+RemoteCDMFactory& WebProcess::cdmFactory()
+{
+    return *supplement<RemoteCDMFactory>();
+}
+#endif
+
+
 } // namespace WebKit
 

trunk/Source/WebKit/WebProcess/WebProcess.h

@@ -119 +119 @@
 class ObjCObjectGraph;
 class ProcessAssertion;
+class RemoteCDMFactory;
 class RemoteLegacyCDMFactory;
 struct ServiceWorkerInitializationData;
@@ -245 +246 @@
     RemoteLegacyCDMFactory& legacyCDMFactory();
 #endif
-
+#if ENABLE(ENCRYPTED_MEDIA)
+    RemoteCDMFactory& cdmFactory();
+#endif
 #endif // ENABLE(GPU_PROCESS)