Diff
Modified: trunk/Source/WebKit/CMakeLists.txt (267426 => 267427)
--- trunk/Source/WebKit/CMakeLists.txt 2020-09-22 18:57:59 UTC (rev 267426)
+++ trunk/Source/WebKit/CMakeLists.txt 2020-09-22 19:01:06 UTC (rev 267427)
@@ -221,7 +221,6 @@
WebProcess/GPU/media/RemoteAudioSession
WebProcess/GPU/media/RemoteCDMInstanceSession
WebProcess/GPU/media/RemoteLegacyCDMSession
- WebProcess/GPU/media/RemoteMediaPlayerManager
WebProcess/GPU/webrtc/LibWebRTCCodecs
WebProcess/GPU/webrtc/SampleBufferDisplayLayer
Modified: trunk/Source/WebKit/ChangeLog (267426 => 267427)
--- trunk/Source/WebKit/ChangeLog 2020-09-22 18:57:59 UTC (rev 267426)
+++ trunk/Source/WebKit/ChangeLog 2020-09-22 19:01:06 UTC (rev 267427)
@@ -1,3 +1,29 @@
+2020-09-22 Peng Liu <[email protected]>
+
+ [Media in GPU Process] Add missing IPC message receivers
+ https://bugs.webkit.org/show_bug.cgi?id=216829
+
+ Reviewed by Jer Noble.
+
+ Add missing IPC message receivers and clean up some macro usages.
+ Also remove the empty RemoteMediaPlayerManager.messages.in.
+
+ No new tests, no functional change.
+
+ * CMakeLists.txt:
+ * DerivedSources-input.xcfilelist:
+ * DerivedSources.make:
+ * GPUProcess/GPUConnectionToWebProcess.cpp:
+ (WebKit::GPUConnectionToWebProcess::dispatchMessage):
+ (WebKit::GPUConnectionToWebProcess::dispatchSyncMessage):
+ * GPUProcess/GPUConnectionToWebProcess.h:
+ * GPUProcess/media/ios/RemoteMediaSessionHelperProxy.h:
+ (WebKit::RemoteMediaSessionHelperProxy::didReceiveMessageFromWebProcess):
+ * WebKit.xcodeproj/project.pbxproj:
+ * WebProcess/GPU/GPUProcessConnection.cpp:
+ (WebKit::GPUProcessConnection::dispatchMessage):
+ * WebProcess/GPU/media/RemoteMediaPlayerManager.messages.in: Removed.
+
2020-09-22 Per Arne Vollan <[email protected]>
[macOS] Start collecting telemetry from a set of XPC services
Modified: trunk/Source/WebKit/DerivedSources-input.xcfilelist (267426 => 267427)
--- trunk/Source/WebKit/DerivedSources-input.xcfilelist 2020-09-22 18:57:59 UTC (rev 267426)
+++ trunk/Source/WebKit/DerivedSources-input.xcfilelist 2020-09-22 19:01:06 UTC (rev 267427)
@@ -128,7 +128,6 @@
$(PROJECT_DIR)/WebProcess/GPU/media/RemoteAudioSession.messages.in
$(PROJECT_DIR)/WebProcess/GPU/media/RemoteCDMInstanceSession.messages.in
$(PROJECT_DIR)/WebProcess/GPU/media/RemoteLegacyCDMSession.messages.in
-$(PROJECT_DIR)/WebProcess/GPU/media/RemoteMediaPlayerManager.messages.in
$(PROJECT_DIR)/WebProcess/GPU/media/ios/RemoteMediaSessionHelper.messages.in
$(PROJECT_DIR)/WebProcess/GPU/webrtc/LibWebRTCCodecs.messages.in
$(PROJECT_DIR)/WebProcess/GPU/webrtc/LibWebRTCRemoteCodecs.messages.in
Modified: trunk/Source/WebKit/DerivedSources.make (267426 => 267427)
--- trunk/Source/WebKit/DerivedSources.make 2020-09-22 18:57:59 UTC (rev 267426)
+++ trunk/Source/WebKit/DerivedSources.make 2020-09-22 19:01:06 UTC (rev 267427)
@@ -172,7 +172,6 @@
WebProcess/GPU/media/RemoteCDMInstanceSession \
WebProcess/GPU/media/RemoteLegacyCDMSession \
WebProcess/GPU/media/ios/RemoteMediaSessionHelper \
- WebProcess/GPU/media/RemoteMediaPlayerManager \
WebProcess/GPU/media/RemoteAudioDestinationProxy \
WebProcess/GPU/media/RemoteAudioSession \
WebProcess/WebStorage/StorageAreaMap \
Modified: trunk/Source/WebKit/GPUProcess/GPUConnectionToWebProcess.cpp (267426 => 267427)
--- trunk/Source/WebKit/GPUProcess/GPUConnectionToWebProcess.cpp 2020-09-22 18:57:59 UTC (rev 267426)
+++ trunk/Source/WebKit/GPUProcess/GPUConnectionToWebProcess.cpp 2020-09-22 19:01:06 UTC (rev 267427)
@@ -91,6 +91,7 @@
#if PLATFORM(IOS_FAMILY)
#include "RemoteMediaSessionHelperProxy.h"
+#include "RemoteMediaSessionHelperProxyMessages.h"
#endif
#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
@@ -263,7 +264,7 @@
}
#endif
-#if ENABLE(GPU_PROCESS) && USE(AUDIO_SESSION)
+#if USE(AUDIO_SESSION)
RemoteAudioSessionProxy& GPUConnectionToWebProcess::audioSessionProxy()
{
if (!m_audioSessionProxy) {
@@ -303,7 +304,7 @@
connection().send(Messages::GPUProcessConnection::DidReceiveRemoteCommand { type, argument }, 0);
}
-#if ENABLE(GPU_PROCESS) && USE(AUDIO_SESSION)
+#if USE(AUDIO_SESSION)
void GPUConnectionToWebProcess::ensureAudioSession(EnsureAudioSessionCompletion&& completion)
{
completion(audioSessionProxy().configuration());
@@ -391,12 +392,18 @@
return true;
}
#endif
-#if ENABLE(GPU_PROCESS) && USE(AUDIO_SESSION)
+#if USE(AUDIO_SESSION)
if (decoder.messageReceiverName() == Messages::RemoteAudioSessionProxy::messageReceiverName()) {
audioSessionProxy().didReceiveMessage(connection, decoder);
return true;
}
#endif
+#if PLATFORM(IOS_FAMILY)
+ if (decoder.messageReceiverName() == Messages::RemoteMediaSessionHelperProxy::messageReceiverName()) {
+ mediaSessionHelperProxy().didReceiveMessageFromWebProcess(connection, decoder);
+ return true;
+ }
+#endif
#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
if (decoder.messageReceiverName() == Messages::RemoteLegacyCDMFactoryProxy::messageReceiverName()) {
legacyCdmFactoryProxy().didReceiveMessageFromWebProcess(connection, decoder);
@@ -444,7 +451,7 @@
return true;
}
#endif
-#if ENABLE(GPU_PROCESS) && USE(AUDIO_SESSION)
+#if USE(AUDIO_SESSION)
if (decoder.messageReceiverName() == Messages::RemoteAudioSessionProxy::messageReceiverName()) {
audioSessionProxy().didReceiveSyncMessage(connection, decoder, replyEncoder);
return true;
Modified: trunk/Source/WebKit/GPUProcess/GPUConnectionToWebProcess.h (267426 => 267427)
--- trunk/Source/WebKit/GPUProcess/GPUConnectionToWebProcess.h 2020-09-22 18:57:59 UTC (rev 267426)
+++ trunk/Source/WebKit/GPUProcess/GPUConnectionToWebProcess.h 2020-09-22 19:01:06 UTC (rev 267427)
@@ -94,15 +94,12 @@
#if ENABLE(ENCRYPTED_MEDIA)
RemoteCDMFactoryProxy& cdmFactoryProxy();
#endif
-#if PLATFORM(IOS_FAMILY)
- RemoteMediaSessionHelperProxy& mediaSessionHelperProxy();
-#endif
#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
RemoteLegacyCDMFactoryProxy& legacyCdmFactoryProxy();
#endif
RemoteMediaPlayerManagerProxy& remoteMediaPlayerManagerProxy();
-#if ENABLE(GPU_PROCESS) && USE(AUDIO_SESSION)
+#if USE(AUDIO_SESSION)
RemoteAudioSessionProxyManager& audioSessionManager();
#endif
@@ -119,10 +116,6 @@
#endif
#endif
-#if ENABLE(GPU_PROCESS) && USE(AUDIO_SESSION)
- RemoteAudioSessionProxy& audioSessionProxy();
-#endif
-
void createRenderingBackend(RenderingBackendIdentifier);
void releaseRenderingBackend(RenderingBackendIdentifier);
@@ -133,12 +126,14 @@
void enableVP9Decoders(bool shouldEnableVP9Decoder, bool shouldEnableVP9SWDecoder);
#endif
-#if ENABLE(GPU_PROCESS) && USE(AUDIO_SESSION)
+#if USE(AUDIO_SESSION)
+ RemoteAudioSessionProxy& audioSessionProxy();
using EnsureAudioSessionCompletion = CompletionHandler<void(const RemoteAudioSessionConfiguration&)>;
void ensureAudioSession(EnsureAudioSessionCompletion&&);
#endif
#if PLATFORM(IOS_FAMILY)
+ RemoteMediaSessionHelperProxy& mediaSessionHelperProxy();
void ensureMediaSessionHelper();
#endif
@@ -189,7 +184,7 @@
#if ENABLE(ENCRYPTED_MEDIA)
std::unique_ptr<RemoteCDMFactoryProxy> m_cdmFactoryProxy;
#endif
-#if ENABLE(GPU_PROCESS) && USE(AUDIO_SESSION)
+#if USE(AUDIO_SESSION)
std::unique_ptr<RemoteAudioSessionProxy> m_audioSessionProxy;
#endif
#if PLATFORM(IOS_FAMILY)
Modified: trunk/Source/WebKit/GPUProcess/media/ios/RemoteMediaSessionHelperProxy.h (267426 => 267427)
--- trunk/Source/WebKit/GPUProcess/media/ios/RemoteMediaSessionHelperProxy.h 2020-09-22 18:57:59 UTC (rev 267426)
+++ trunk/Source/WebKit/GPUProcess/media/ios/RemoteMediaSessionHelperProxy.h 2020-09-22 19:01:06 UTC (rev 267427)
@@ -42,6 +42,8 @@
RemoteMediaSessionHelperProxy(GPUConnectionToWebProcess&);
virtual ~RemoteMediaSessionHelperProxy();
+ void didReceiveMessageFromWebProcess(IPC::Connection& connection, IPC::Decoder& decoder) { didReceiveMessage(connection, decoder); }
+
private:
// IPC::MessageReceiver
void didReceiveMessage(IPC::Connection&, IPC::Decoder&) final;
Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (267426 => 267427)
--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2020-09-22 18:57:59 UTC (rev 267426)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2020-09-22 19:01:06 UTC (rev 267427)
@@ -96,11 +96,8 @@
076E884E1A13CADF005E90FC /* APIContextMenuClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 076E884D1A13CADF005E90FC /* APIContextMenuClient.h */; };
0772811D21234FF600C8EF2E /* UserMediaPermissionRequestManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A410F4319AF7B27002EBAB5 /* UserMediaPermissionRequestManager.h */; };
07923148239CBCB8009598E2 /* RemoteMediaPlayerManagerProxyMessagesReplies.h in Headers */ = {isa = PBXBuildFile; fileRef = 07923142239CBCB5009598E2 /* RemoteMediaPlayerManagerProxyMessagesReplies.h */; };
- 07923149239CBCB8009598E2 /* RemoteMediaPlayerManagerMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07923143239CBCB6009598E2 /* RemoteMediaPlayerManagerMessageReceiver.cpp */; };
- 0792314A239CBCB8009598E2 /* RemoteMediaPlayerManagerMessagesReplies.h in Headers */ = {isa = PBXBuildFile; fileRef = 07923144239CBCB6009598E2 /* RemoteMediaPlayerManagerMessagesReplies.h */; };
0792314B239CBCB8009598E2 /* RemoteMediaPlayerManagerProxyMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07923145239CBCB7009598E2 /* RemoteMediaPlayerManagerProxyMessageReceiver.cpp */; };
0792314C239CBCB8009598E2 /* RemoteMediaPlayerManagerProxyMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 07923146239CBCB7009598E2 /* RemoteMediaPlayerManagerProxyMessages.h */; };
- 0792314D239CBCB8009598E2 /* RemoteMediaPlayerManagerMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 07923147239CBCB7009598E2 /* RemoteMediaPlayerManagerMessages.h */; };
07A5EBBC1C7BA43E00B9CA69 /* WKFrameHandleRef.h in Headers */ = {isa = PBXBuildFile; fileRef = 07A5EBBA1C7BA43E00B9CA69 /* WKFrameHandleRef.h */; settings = {ATTRIBUTES = (Private, ); }; };
07E19EFB23D401F10094FFB4 /* MediaPlayerPrivateRemoteMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07E19EF823D401F00094FFB4 /* MediaPlayerPrivateRemoteMessageReceiver.cpp */; };
07E19EFC23D401F10094FFB4 /* MediaPlayerPrivateRemoteMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 07E19EF923D401F00094FFB4 /* MediaPlayerPrivateRemoteMessages.h */; };
@@ -2168,14 +2165,10 @@
07923130239B3B0C009598E2 /* RemoteMediaPlayerManager.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = RemoteMediaPlayerManager.cpp; sourceTree = "<group>"; };
07923131239B3B0C009598E2 /* MediaPlayerPrivateRemote.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = MediaPlayerPrivateRemote.cpp; sourceTree = "<group>"; };
07923132239B3B0C009598E2 /* MediaPlayerPrivateRemote.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MediaPlayerPrivateRemote.h; sourceTree = "<group>"; };
- 07923133239B3B0C009598E2 /* RemoteMediaPlayerManager.messages.in */ = {isa = PBXFileReference; lastKnownFileType = text; path = RemoteMediaPlayerManager.messages.in; sourceTree = "<group>"; };
07923134239B3B0C009598E2 /* RemoteMediaPlayerManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RemoteMediaPlayerManager.h; sourceTree = "<group>"; };
07923142239CBCB5009598E2 /* RemoteMediaPlayerManagerProxyMessagesReplies.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RemoteMediaPlayerManagerProxyMessagesReplies.h; sourceTree = "<group>"; };
- 07923143239CBCB6009598E2 /* RemoteMediaPlayerManagerMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RemoteMediaPlayerManagerMessageReceiver.cpp; sourceTree = "<group>"; };
- 07923144239CBCB6009598E2 /* RemoteMediaPlayerManagerMessagesReplies.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RemoteMediaPlayerManagerMessagesReplies.h; sourceTree = "<group>"; };
07923145239CBCB7009598E2 /* RemoteMediaPlayerManagerProxyMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RemoteMediaPlayerManagerProxyMessageReceiver.cpp; sourceTree = "<group>"; };
07923146239CBCB7009598E2 /* RemoteMediaPlayerManagerProxyMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RemoteMediaPlayerManagerProxyMessages.h; sourceTree = "<group>"; };
- 07923147239CBCB7009598E2 /* RemoteMediaPlayerManagerMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RemoteMediaPlayerManagerMessages.h; sourceTree = "<group>"; };
0792314E239D5F53009598E2 /* MediaPlayerPrivateRemoteIdentifier.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MediaPlayerPrivateRemoteIdentifier.h; sourceTree = "<group>"; };
0794B4AB24451BB90001B9C4 /* MediaUsageManagerCocoa.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MediaUsageManagerCocoa.mm; sourceTree = "<group>"; };
0794B4AC24451BB90001B9C4 /* MediaUsageManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MediaUsageManager.h; sourceTree = "<group>"; };
@@ -5210,13 +5203,10 @@
CDD53570240DD4EF00F7B8C4 /* RemoteAudioSessionProxyManager.messages.in */ = {isa = PBXFileReference; lastKnownFileType = text; path = RemoteAudioSessionProxyManager.messages.in; sourceTree = "<group>"; };
CDD53571240DDE0600F7B8C4 /* RemoteAudioSessionProxyMessageReceiver.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = RemoteAudioSessionProxyMessageReceiver.cpp; sourceTree = "<group>"; };
CDD53572240DDE0600F7B8C4 /* RemoteAudioSessionProxyMessages.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RemoteAudioSessionProxyMessages.h; sourceTree = "<group>"; };
- CDD53573240DDE0600F7B8C4 /* RemoteAudioSessionProxyManagerMessageReceiver.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = RemoteAudioSessionProxyManagerMessageReceiver.cpp; sourceTree = "<group>"; };
CDD53574240DDE0700F7B8C4 /* RemoteAudioSessionMessagesReplies.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RemoteAudioSessionMessagesReplies.h; sourceTree = "<group>"; };
CDD53575240DDE0700F7B8C4 /* RemoteAudioSessionMessages.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RemoteAudioSessionMessages.h; sourceTree = "<group>"; };
CDD53576240DDE0700F7B8C4 /* RemoteAudioSessionMessageReceiver.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = RemoteAudioSessionMessageReceiver.cpp; sourceTree = "<group>"; };
CDD53577240DDE0700F7B8C4 /* RemoteAudioSessionProxyMessagesReplies.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RemoteAudioSessionProxyMessagesReplies.h; sourceTree = "<group>"; };
- CDD53578240DDE0800F7B8C4 /* RemoteAudioSessionProxyManagerMessages.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RemoteAudioSessionProxyManagerMessages.h; sourceTree = "<group>"; };
- CDD53579240DDE0800F7B8C4 /* RemoteAudioSessionProxyManagerMessagesReplies.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RemoteAudioSessionProxyManagerMessagesReplies.h; sourceTree = "<group>"; };
CDE554E224058114008A3DDB /* RemoteLegacyCDMFactory.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RemoteLegacyCDMFactory.h; sourceTree = "<group>"; };
CDE554E324058114008A3DDB /* RemoteLegacyCDMFactory.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = RemoteLegacyCDMFactory.cpp; sourceTree = "<group>"; };
CDE554EA24058183008A3DDB /* RemoteLegacyCDM.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RemoteLegacyCDM.h; sourceTree = "<group>"; };
@@ -5568,7 +5558,6 @@
07B93FF523AF0CB80036F8EA /* RemoteMediaPlayerConfiguration.h */,
07923130239B3B0C009598E2 /* RemoteMediaPlayerManager.cpp */,
07923134239B3B0C009598E2 /* RemoteMediaPlayerManager.h */,
- 07923133239B3B0C009598E2 /* RemoteMediaPlayerManager.messages.in */,
0701789B23BAE261005F0FAA /* RemoteMediaPlayerMIMETypeCache.cpp */,
0701789C23BAE262005F0FAA /* RemoteMediaPlayerMIMETypeCache.h */,
07B3B46F23AB2CB300BA5B12 /* RemoteMediaPlayerState.h */,
@@ -10090,9 +10079,6 @@
CDD53576240DDE0700F7B8C4 /* RemoteAudioSessionMessageReceiver.cpp */,
CDD53575240DDE0700F7B8C4 /* RemoteAudioSessionMessages.h */,
CDD53574240DDE0700F7B8C4 /* RemoteAudioSessionMessagesReplies.h */,
- CDD53573240DDE0600F7B8C4 /* RemoteAudioSessionProxyManagerMessageReceiver.cpp */,
- CDD53578240DDE0800F7B8C4 /* RemoteAudioSessionProxyManagerMessages.h */,
- CDD53579240DDE0800F7B8C4 /* RemoteAudioSessionProxyManagerMessagesReplies.h */,
CDD53571240DDE0600F7B8C4 /* RemoteAudioSessionProxyMessageReceiver.cpp */,
CDD53572240DDE0600F7B8C4 /* RemoteAudioSessionProxyMessages.h */,
CDD53577240DDE0700F7B8C4 /* RemoteAudioSessionProxyMessagesReplies.h */,
@@ -10126,9 +10112,6 @@
CDE555312406B897008A3DDB /* RemoteLegacyCDMSessionProxyMessageReceiver.cpp */,
CDE5552F2406B897008A3DDB /* RemoteLegacyCDMSessionProxyMessages.h */,
CDE555262406B895008A3DDB /* RemoteLegacyCDMSessionProxyMessagesReplies.h */,
- 07923143239CBCB6009598E2 /* RemoteMediaPlayerManagerMessageReceiver.cpp */,
- 07923147239CBCB7009598E2 /* RemoteMediaPlayerManagerMessages.h */,
- 07923144239CBCB6009598E2 /* RemoteMediaPlayerManagerMessagesReplies.h */,
07923145239CBCB7009598E2 /* RemoteMediaPlayerManagerProxyMessageReceiver.cpp */,
07923146239CBCB7009598E2 /* RemoteMediaPlayerManagerProxyMessages.h */,
07923142239CBCB5009598E2 /* RemoteMediaPlayerManagerProxyMessagesReplies.h */,
@@ -11121,8 +11104,6 @@
0FF264A01A1FF9CC001FE759 /* RemoteLayerTreeScrollingPerformanceData.h in Headers */,
1AF1AC6C1651759E00C17D7F /* RemoteLayerTreeTransaction.h in Headers */,
2DC18FB3218A6E9E0025A88D /* RemoteLayerTreeViews.h in Headers */,
- 0792314D239CBCB8009598E2 /* RemoteMediaPlayerManagerMessages.h in Headers */,
- 0792314A239CBCB8009598E2 /* RemoteMediaPlayerManagerMessagesReplies.h in Headers */,
0792314C239CBCB8009598E2 /* RemoteMediaPlayerManagerProxyMessages.h in Headers */,
07923148239CBCB8009598E2 /* RemoteMediaPlayerManagerProxyMessagesReplies.h in Headers */,
071BC59023CE1EAA00680D7C /* RemoteMediaPlayerProxyMessages.h in Headers */,
@@ -12861,7 +12842,6 @@
CDE555332406EB8C008A3DDB /* RemoteLegacyCDMProxyMessageReceiver.cpp in Sources */,
CDE555342406EB8C008A3DDB /* RemoteLegacyCDMSessionMessageReceiver.cpp in Sources */,
CDE555352406EB8C008A3DDB /* RemoteLegacyCDMSessionProxyMessageReceiver.cpp in Sources */,
- 07923149239CBCB8009598E2 /* RemoteMediaPlayerManagerMessageReceiver.cpp in Sources */,
0792314B239CBCB8009598E2 /* RemoteMediaPlayerManagerProxyMessageReceiver.cpp in Sources */,
0701789E23BE9CFC005F0FAA /* RemoteMediaPlayerMIMETypeCache.cpp in Sources */,
071BC58F23CE1EAA00680D7C /* RemoteMediaPlayerProxyMessageReceiver.cpp in Sources */,
Modified: trunk/Source/WebKit/WebProcess/GPU/GPUProcessConnection.cpp (267426 => 267427)
--- trunk/Source/WebKit/WebProcess/GPU/GPUProcessConnection.cpp 2020-09-22 18:57:59 UTC (rev 267426)
+++ trunk/Source/WebKit/WebProcess/GPU/GPUProcessConnection.cpp 2020-09-22 19:01:06 UTC (rev 267427)
@@ -37,7 +37,6 @@
#include "RemoteCDMProxy.h"
#include "RemoteLegacyCDMFactory.h"
#include "RemoteMediaPlayerManager.h"
-#include "RemoteMediaPlayerManagerMessages.h"
#include "SampleBufferDisplayLayerMessages.h"
#include "WebCoreArgumentCoders.h"
#include "WebPage.h"
@@ -51,6 +50,11 @@
#include "RemoteCDMInstanceSessionMessages.h"
#endif
+#if USE(AUDIO_SESSION)
+#include "RemoteAudioSession.h"
+#include "RemoteAudioSessionMessages.h"
+#endif
+
#if PLATFORM(COCOA) && ENABLE(MEDIA_STREAM)
#include "UserMediaCaptureManager.h"
#include "UserMediaCaptureManagerMessages.h"
@@ -124,7 +128,6 @@
sampleBufferDisplayLayerManager().didReceiveLayerMessage(connection, decoder);
return true;
}
-
#endif // PLATFORM(COCOA) && ENABLE(MEDIA_STREAM)
#if USE(LIBWEBRTC) && PLATFORM(COCOA)
if (decoder.messageReceiverName() == Messages::LibWebRTCCodecs::messageReceiverName()) {
@@ -132,6 +135,12 @@
return true;
}
#endif
+#if USE(AUDIO_SESSION)
+ if (decoder.messageReceiverName() == Messages::RemoteAudioSession::messageReceiverName()) {
+ // FIXME
+ return true;
+ }
+#endif
#if ENABLE(ENCRYPTED_MEDIA)
if (decoder.messageReceiverName() == Messages::RemoteCDMInstanceSession::messageReceiverName()) {
WebProcess::singleton().supplement<RemoteCDMFactory>()->didReceiveSessionMessage(connection, decoder);
Deleted: trunk/Source/WebKit/WebProcess/GPU/media/RemoteMediaPlayerManager.messages.in (267426 => 267427)
--- trunk/Source/WebKit/WebProcess/GPU/media/RemoteMediaPlayerManager.messages.in 2020-09-22 18:57:59 UTC (rev 267426)
+++ trunk/Source/WebKit/WebProcess/GPU/media/RemoteMediaPlayerManager.messages.in 2020-09-22 19:01:06 UTC (rev 267427)
@@ -1,30 +0,0 @@
-# Copyright (C) 2019-2020 Apple Inc. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-# THE POSSIBILITY OF SUCH DAMAGE.
-
-#if ENABLE(GPU_PROCESS)
-
-messages -> RemoteMediaPlayerManager NotRefCounted {
-
-}
-
-#endif
