⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 267427 in webkit


Ignore:
Timestamp:
Sep 22, 2020, 12:01:06 PM (6 years ago)
Author:
Peng Liu
Message:

[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.
Location:
trunk/Source/WebKit
Files:
1 deleted
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/CMakeLists.txt

    r267181 r267427  
    222222    WebProcess/GPU/media/RemoteCDMInstanceSession
    223223    WebProcess/GPU/media/RemoteLegacyCDMSession
    224     WebProcess/GPU/media/RemoteMediaPlayerManager
    225224
    226225    WebProcess/GPU/webrtc/LibWebRTCCodecs

  • trunk/Source/WebKit/ChangeLog

    r267421 r267427  
     12020-09-22  Peng Liu  <peng.liu6@apple.com>
     2
     3        [Media in GPU Process] Add missing IPC message receivers
     4        https://bugs.webkit.org/show_bug.cgi?id=216829
     5
     6        Reviewed by Jer Noble.
     7
     8        Add missing IPC message receivers and clean up some macro usages.
     9        Also remove the empty RemoteMediaPlayerManager.messages.in.
     10
     11        No new tests, no functional change.
     12
     13        * CMakeLists.txt:
     14        * DerivedSources-input.xcfilelist:
     15        * DerivedSources.make:
     16        * GPUProcess/GPUConnectionToWebProcess.cpp:
     17        (WebKit::GPUConnectionToWebProcess::dispatchMessage):
     18        (WebKit::GPUConnectionToWebProcess::dispatchSyncMessage):
     19        * GPUProcess/GPUConnectionToWebProcess.h:
     20        * GPUProcess/media/ios/RemoteMediaSessionHelperProxy.h:
     21        (WebKit::RemoteMediaSessionHelperProxy::didReceiveMessageFromWebProcess):
     22        * WebKit.xcodeproj/project.pbxproj:
     23        * WebProcess/GPU/GPUProcessConnection.cpp:
     24        (WebKit::GPUProcessConnection::dispatchMessage):
     25        * WebProcess/GPU/media/RemoteMediaPlayerManager.messages.in: Removed.
     26
    1272020-09-22  Per Arne Vollan  <pvollan@apple.com>
    228

  • trunk/Source/WebKit/DerivedSources-input.xcfilelist

    r267181 r267427  
    129129$(PROJECT_DIR)/WebProcess/GPU/media/RemoteCDMInstanceSession.messages.in
    130130$(PROJECT_DIR)/WebProcess/GPU/media/RemoteLegacyCDMSession.messages.in
    131 $(PROJECT_DIR)/WebProcess/GPU/media/RemoteMediaPlayerManager.messages.in
    132131$(PROJECT_DIR)/WebProcess/GPU/media/ios/RemoteMediaSessionHelper.messages.in
    133132$(PROJECT_DIR)/WebProcess/GPU/webrtc/LibWebRTCCodecs.messages.in

  • trunk/Source/WebKit/DerivedSources.make

    r267181 r267427  
    173173        WebProcess/GPU/media/RemoteLegacyCDMSession \
    174174        WebProcess/GPU/media/ios/RemoteMediaSessionHelper \
    175         WebProcess/GPU/media/RemoteMediaPlayerManager \
    176175        WebProcess/GPU/media/RemoteAudioDestinationProxy \
    177176        WebProcess/GPU/media/RemoteAudioSession \

  • trunk/Source/WebKit/GPUProcess/GPUConnectionToWebProcess.cpp

    r267156 r267427  
    9292#if PLATFORM(IOS_FAMILY)
    9393#include "RemoteMediaSessionHelperProxy.h"
     94#include "RemoteMediaSessionHelperProxyMessages.h"
    9495#endif
    9596
    … …  
    264265#endif
    265266
    266 #if ENABLE(GPU_PROCESS) && USE(AUDIO_SESSION)
     267#if USE(AUDIO_SESSION)
    267268RemoteAudioSessionProxy& GPUConnectionToWebProcess::audioSessionProxy()
    268269{
    … …  
    304305}
    305306
    306 #if ENABLE(GPU_PROCESS) && USE(AUDIO_SESSION)
     307#if USE(AUDIO_SESSION)
    307308void GPUConnectionToWebProcess::ensureAudioSession(EnsureAudioSessionCompletion&& completion)
    308309{
    … …  
    392393    }
    393394#endif
    394 #if ENABLE(GPU_PROCESS) && USE(AUDIO_SESSION)
     395#if USE(AUDIO_SESSION)
    395396    if (decoder.messageReceiverName() == Messages::RemoteAudioSessionProxy::messageReceiverName()) {
    396397        audioSessionProxy().didReceiveMessage(connection, decoder);
     398        return true;
     399    }
     400#endif
     401#if PLATFORM(IOS_FAMILY)
     402    if (decoder.messageReceiverName() == Messages::RemoteMediaSessionHelperProxy::messageReceiverName()) {
     403        mediaSessionHelperProxy().didReceiveMessageFromWebProcess(connection, decoder);
    397404        return true;
    398405    }
    … …  
    445452    }
    446453#endif
    447 #if ENABLE(GPU_PROCESS) && USE(AUDIO_SESSION)
     454#if USE(AUDIO_SESSION)
    448455    if (decoder.messageReceiverName() == Messages::RemoteAudioSessionProxy::messageReceiverName()) {
    449456        audioSessionProxy().didReceiveSyncMessage(connection, decoder, replyEncoder);

  • trunk/Source/WebKit/GPUProcess/GPUConnectionToWebProcess.h

    r267156 r267427  
    9595    RemoteCDMFactoryProxy& cdmFactoryProxy();
    9696#endif
    97 #if PLATFORM(IOS_FAMILY)
    98     RemoteMediaSessionHelperProxy& mediaSessionHelperProxy();
    99 #endif
    10097#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
    10198    RemoteLegacyCDMFactoryProxy& legacyCdmFactoryProxy();
    … …  
    103100    RemoteMediaPlayerManagerProxy& remoteMediaPlayerManagerProxy();
    104101
    105 #if ENABLE(GPU_PROCESS) && USE(AUDIO_SESSION)
     102#if USE(AUDIO_SESSION)
    106103    RemoteAudioSessionProxyManager& audioSessionManager();
    107104#endif
    … …  
    120117#endif
    121118
    122 #if ENABLE(GPU_PROCESS) && USE(AUDIO_SESSION)
    123     RemoteAudioSessionProxy& audioSessionProxy();
    124 #endif
    125 
    126119    void createRenderingBackend(RenderingBackendIdentifier);
    127120    void releaseRenderingBackend(RenderingBackendIdentifier);
    … …  
    134127#endif
    135128
    136 #if ENABLE(GPU_PROCESS) && USE(AUDIO_SESSION)
     129#if USE(AUDIO_SESSION)
     130    RemoteAudioSessionProxy& audioSessionProxy();
    137131    using EnsureAudioSessionCompletion = CompletionHandler<void(const RemoteAudioSessionConfiguration&)>;
    138132    void ensureAudioSession(EnsureAudioSessionCompletion&&);
    … …  
    140134
    141135#if PLATFORM(IOS_FAMILY)
     136    RemoteMediaSessionHelperProxy& mediaSessionHelperProxy();
    142137    void ensureMediaSessionHelper();
    143138#endif
    … …  
    190185    std::unique_ptr<RemoteCDMFactoryProxy> m_cdmFactoryProxy;
    191186#endif
    192 #if ENABLE(GPU_PROCESS) && USE(AUDIO_SESSION)
     187#if USE(AUDIO_SESSION)
    193188    std::unique_ptr<RemoteAudioSessionProxy> m_audioSessionProxy;
    194189#endif

  • trunk/Source/WebKit/GPUProcess/media/ios/RemoteMediaSessionHelperProxy.h

    r264177 r267427  
    4343    virtual ~RemoteMediaSessionHelperProxy();
    4444
     45    void didReceiveMessageFromWebProcess(IPC::Connection& connection, IPC::Decoder& decoder) { didReceiveMessage(connection, decoder); }
     46
    4547private:
    4648    // IPC::MessageReceiver

  • trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj

    r267414 r267427  
    9797                0772811D21234FF600C8EF2E /* UserMediaPermissionRequestManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A410F4319AF7B27002EBAB5 /* UserMediaPermissionRequestManager.h */; };
    9898                07923148239CBCB8009598E2 /* RemoteMediaPlayerManagerProxyMessagesReplies.h in Headers */ = {isa = PBXBuildFile; fileRef = 07923142239CBCB5009598E2 /* RemoteMediaPlayerManagerProxyMessagesReplies.h */; };
    99                 07923149239CBCB8009598E2 /* RemoteMediaPlayerManagerMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07923143239CBCB6009598E2 /* RemoteMediaPlayerManagerMessageReceiver.cpp */; };
    100                 0792314A239CBCB8009598E2 /* RemoteMediaPlayerManagerMessagesReplies.h in Headers */ = {isa = PBXBuildFile; fileRef = 07923144239CBCB6009598E2 /* RemoteMediaPlayerManagerMessagesReplies.h */; };
    10199                0792314B239CBCB8009598E2 /* RemoteMediaPlayerManagerProxyMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07923145239CBCB7009598E2 /* RemoteMediaPlayerManagerProxyMessageReceiver.cpp */; };
    102100                0792314C239CBCB8009598E2 /* RemoteMediaPlayerManagerProxyMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 07923146239CBCB7009598E2 /* RemoteMediaPlayerManagerProxyMessages.h */; };
    103                 0792314D239CBCB8009598E2 /* RemoteMediaPlayerManagerMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 07923147239CBCB7009598E2 /* RemoteMediaPlayerManagerMessages.h */; };
    104101                07A5EBBC1C7BA43E00B9CA69 /* WKFrameHandleRef.h in Headers */ = {isa = PBXBuildFile; fileRef = 07A5EBBA1C7BA43E00B9CA69 /* WKFrameHandleRef.h */; settings = {ATTRIBUTES = (Private, ); }; };
    105102                07E19EFB23D401F10094FFB4 /* MediaPlayerPrivateRemoteMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07E19EF823D401F00094FFB4 /* MediaPlayerPrivateRemoteMessageReceiver.cpp */; };
    … …  
    21692166                07923131239B3B0C009598E2 /* MediaPlayerPrivateRemote.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = MediaPlayerPrivateRemote.cpp; sourceTree = "<group>"; };
    21702167                07923132239B3B0C009598E2 /* MediaPlayerPrivateRemote.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MediaPlayerPrivateRemote.h; sourceTree = "<group>"; };
    2171                 07923133239B3B0C009598E2 /* RemoteMediaPlayerManager.messages.in */ = {isa = PBXFileReference; lastKnownFileType = text; path = RemoteMediaPlayerManager.messages.in; sourceTree = "<group>"; };
    21722168                07923134239B3B0C009598E2 /* RemoteMediaPlayerManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RemoteMediaPlayerManager.h; sourceTree = "<group>"; };
    21732169                07923142239CBCB5009598E2 /* RemoteMediaPlayerManagerProxyMessagesReplies.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RemoteMediaPlayerManagerProxyMessagesReplies.h; sourceTree = "<group>"; };
    2174                 07923143239CBCB6009598E2 /* RemoteMediaPlayerManagerMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RemoteMediaPlayerManagerMessageReceiver.cpp; sourceTree = "<group>"; };
    2175                 07923144239CBCB6009598E2 /* RemoteMediaPlayerManagerMessagesReplies.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RemoteMediaPlayerManagerMessagesReplies.h; sourceTree = "<group>"; };
    21762170                07923145239CBCB7009598E2 /* RemoteMediaPlayerManagerProxyMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RemoteMediaPlayerManagerProxyMessageReceiver.cpp; sourceTree = "<group>"; };
    21772171                07923146239CBCB7009598E2 /* RemoteMediaPlayerManagerProxyMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RemoteMediaPlayerManagerProxyMessages.h; sourceTree = "<group>"; };
    2178                 07923147239CBCB7009598E2 /* RemoteMediaPlayerManagerMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RemoteMediaPlayerManagerMessages.h; sourceTree = "<group>"; };
    21792172                0792314E239D5F53009598E2 /* MediaPlayerPrivateRemoteIdentifier.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MediaPlayerPrivateRemoteIdentifier.h; sourceTree = "<group>"; };
    21802173                0794B4AB24451BB90001B9C4 /* MediaUsageManagerCocoa.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MediaUsageManagerCocoa.mm; sourceTree = "<group>"; };
    … …  
    52115204                CDD53571240DDE0600F7B8C4 /* RemoteAudioSessionProxyMessageReceiver.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = RemoteAudioSessionProxyMessageReceiver.cpp; sourceTree = "<group>"; };
    52125205                CDD53572240DDE0600F7B8C4 /* RemoteAudioSessionProxyMessages.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RemoteAudioSessionProxyMessages.h; sourceTree = "<group>"; };
    5213                 CDD53573240DDE0600F7B8C4 /* RemoteAudioSessionProxyManagerMessageReceiver.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = RemoteAudioSessionProxyManagerMessageReceiver.cpp; sourceTree = "<group>"; };
    52145206                CDD53574240DDE0700F7B8C4 /* RemoteAudioSessionMessagesReplies.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RemoteAudioSessionMessagesReplies.h; sourceTree = "<group>"; };
    52155207                CDD53575240DDE0700F7B8C4 /* RemoteAudioSessionMessages.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RemoteAudioSessionMessages.h; sourceTree = "<group>"; };
    52165208                CDD53576240DDE0700F7B8C4 /* RemoteAudioSessionMessageReceiver.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = RemoteAudioSessionMessageReceiver.cpp; sourceTree = "<group>"; };
    52175209                CDD53577240DDE0700F7B8C4 /* RemoteAudioSessionProxyMessagesReplies.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RemoteAudioSessionProxyMessagesReplies.h; sourceTree = "<group>"; };
    5218                 CDD53578240DDE0800F7B8C4 /* RemoteAudioSessionProxyManagerMessages.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RemoteAudioSessionProxyManagerMessages.h; sourceTree = "<group>"; };
    5219                 CDD53579240DDE0800F7B8C4 /* RemoteAudioSessionProxyManagerMessagesReplies.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RemoteAudioSessionProxyManagerMessagesReplies.h; sourceTree = "<group>"; };
    52205210                CDE554E224058114008A3DDB /* RemoteLegacyCDMFactory.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RemoteLegacyCDMFactory.h; sourceTree = "<group>"; };
    52215211                CDE554E324058114008A3DDB /* RemoteLegacyCDMFactory.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = RemoteLegacyCDMFactory.cpp; sourceTree = "<group>"; };
    … …  
    55695559                                07923130239B3B0C009598E2 /* RemoteMediaPlayerManager.cpp */,
    55705560                                07923134239B3B0C009598E2 /* RemoteMediaPlayerManager.h */,
    5571                                 07923133239B3B0C009598E2 /* RemoteMediaPlayerManager.messages.in */,
    55725561                                0701789B23BAE261005F0FAA /* RemoteMediaPlayerMIMETypeCache.cpp */,
    55735562                                0701789C23BAE262005F0FAA /* RemoteMediaPlayerMIMETypeCache.h */,
    … …  
    1009110080                                CDD53575240DDE0700F7B8C4 /* RemoteAudioSessionMessages.h */,
    1009210081                                CDD53574240DDE0700F7B8C4 /* RemoteAudioSessionMessagesReplies.h */,
    10093                                 CDD53573240DDE0600F7B8C4 /* RemoteAudioSessionProxyManagerMessageReceiver.cpp */,
    10094                                 CDD53578240DDE0800F7B8C4 /* RemoteAudioSessionProxyManagerMessages.h */,
    10095                                 CDD53579240DDE0800F7B8C4 /* RemoteAudioSessionProxyManagerMessagesReplies.h */,
    1009610082                                CDD53571240DDE0600F7B8C4 /* RemoteAudioSessionProxyMessageReceiver.cpp */,
    1009710083                                CDD53572240DDE0600F7B8C4 /* RemoteAudioSessionProxyMessages.h */,
    … …  
    1012710113                                CDE5552F2406B897008A3DDB /* RemoteLegacyCDMSessionProxyMessages.h */,
    1012810114                                CDE555262406B895008A3DDB /* RemoteLegacyCDMSessionProxyMessagesReplies.h */,
    10129                                 07923143239CBCB6009598E2 /* RemoteMediaPlayerManagerMessageReceiver.cpp */,
    10130                                 07923147239CBCB7009598E2 /* RemoteMediaPlayerManagerMessages.h */,
    10131                                 07923144239CBCB6009598E2 /* RemoteMediaPlayerManagerMessagesReplies.h */,
    1013210115                                07923145239CBCB7009598E2 /* RemoteMediaPlayerManagerProxyMessageReceiver.cpp */,
    1013310116                                07923146239CBCB7009598E2 /* RemoteMediaPlayerManagerProxyMessages.h */,
    … …  
    1112211105                                1AF1AC6C1651759E00C17D7F /* RemoteLayerTreeTransaction.h in Headers */,
    1112311106                                2DC18FB3218A6E9E0025A88D /* RemoteLayerTreeViews.h in Headers */,
    11124                                 0792314D239CBCB8009598E2 /* RemoteMediaPlayerManagerMessages.h in Headers */,
    11125                                 0792314A239CBCB8009598E2 /* RemoteMediaPlayerManagerMessagesReplies.h in Headers */,
    1112611107                                0792314C239CBCB8009598E2 /* RemoteMediaPlayerManagerProxyMessages.h in Headers */,
    1112711108                                07923148239CBCB8009598E2 /* RemoteMediaPlayerManagerProxyMessagesReplies.h in Headers */,
    … …  
    1286212843                                CDE555342406EB8C008A3DDB /* RemoteLegacyCDMSessionMessageReceiver.cpp in Sources */,
    1286312844                                CDE555352406EB8C008A3DDB /* RemoteLegacyCDMSessionProxyMessageReceiver.cpp in Sources */,
    12864                                 07923149239CBCB8009598E2 /* RemoteMediaPlayerManagerMessageReceiver.cpp in Sources */,
    1286512845                                0792314B239CBCB8009598E2 /* RemoteMediaPlayerManagerProxyMessageReceiver.cpp in Sources */,
    1286612846                                0701789E23BE9CFC005F0FAA /* RemoteMediaPlayerMIMETypeCache.cpp in Sources */,

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

    r267079 r267427  
    3838#include "RemoteLegacyCDMFactory.h"
    3939#include "RemoteMediaPlayerManager.h"
    40 #include "RemoteMediaPlayerManagerMessages.h"
    4140#include "SampleBufferDisplayLayerMessages.h"
    4241#include "WebCoreArgumentCoders.h"
    … …  
    5049#if ENABLE(ENCRYPTED_MEDIA)
    5150#include "RemoteCDMInstanceSessionMessages.h"
     51#endif
     52
     53#if USE(AUDIO_SESSION)
     54#include "RemoteAudioSession.h"
     55#include "RemoteAudioSessionMessages.h"
    5256#endif
    5357
    … …  
    125129        return true;
    126130    }
    127 
    128131#endif // PLATFORM(COCOA) && ENABLE(MEDIA_STREAM)
    129132#if USE(LIBWEBRTC) && PLATFORM(COCOA)
    130133    if (decoder.messageReceiverName() == Messages::LibWebRTCCodecs::messageReceiverName()) {
    131134        WebProcess::singleton().libWebRTCCodecs().didReceiveMessage(connection, decoder);
     135        return true;
     136    }
     137#endif
     138#if USE(AUDIO_SESSION)
     139    if (decoder.messageReceiverName() == Messages::RemoteAudioSession::messageReceiverName()) {
     140        // FIXME
    132141        return true;
    133142    }
Note: See TracChangeset for help on using the changeset viewer.