Changeset 281376 in webkit


Ignore:
Timestamp:
Aug 21, 2021, 11:15:15 AM (4 years ago)
Author:
Simon Fraser
Message:

Use MediaKeySystemRequestIdentifier, rather than mysterious uint64_t values, in WebKit
​https://bugs.webkit.org/show_bug.cgi?id=229310

Reviewed by Youenn Fablet.

WebCore already had an ObjectIdentifer<> type for media system key requests, MediaKeySystemRequestIdentifier.
Use it in the WebKit layer.

  • Scripts/webkit/messages.py:

(types_that_cannot_be_forward_declared):
(headers_for_type):

  • UIProcess/MediaKeySystemPermissionRequestManagerProxy.cpp:

(WebKit::MediaKeySystemPermissionRequestManagerProxy::denyRequest):
(WebKit::MediaKeySystemPermissionRequestManagerProxy::grantRequest):
(WebKit::MediaKeySystemPermissionRequestManagerProxy::createRequestForFrame):

  • UIProcess/MediaKeySystemPermissionRequestManagerProxy.h:
  • UIProcess/MediaKeySystemPermissionRequestProxy.cpp:

(WebKit::MediaKeySystemPermissionRequestProxy::MediaKeySystemPermissionRequestProxy):

  • UIProcess/MediaKeySystemPermissionRequestProxy.h:

(WebKit::MediaKeySystemPermissionRequestProxy::create):
(WebKit::MediaKeySystemPermissionRequestProxy::mediaKeySystemID const):

  • UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::requestMediaKeySystemPermissionForFrame):

  • UIProcess/WebPageProxy.h:
  • UIProcess/WebPageProxy.messages.in:
  • WebProcess/EncryptedMedia/MediaKeySystemPermissionRequestManager.cpp:

(WebKit::MediaKeySystemPermissionRequestManager::sendMediaKeySystemRequest):
(WebKit::MediaKeySystemPermissionRequestManager::mediaKeySystemWasGranted):
(WebKit::MediaKeySystemPermissionRequestManager::mediaKeySystemWasDenied):

  • WebProcess/EncryptedMedia/MediaKeySystemPermissionRequestManager.h:
  • WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::mediaKeySystemWasGranted):
(WebKit::WebPage::mediaKeySystemWasDenied):

  • WebProcess/WebPage/WebPage.h:
  • WebProcess/WebPage/WebPage.messages.in:
Location:
trunk/Source
Files:
1 added
17 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/Headers.cmake

    r281360 r281376  
    2828    Modules/encryptedmedia/MediaKeySystemController.h
    2929    Modules/encryptedmedia/MediaKeySystemRequest.h
     30    Modules/encryptedmedia/MediaKeySystemRequestIdentifier.h
    3031
    3132    Modules/fetch/FetchBodyConsumer.h

  • trunk/Source/WebCore/Modules/encryptedmedia/MediaKeySystemRequest.h

    r272573 r281376  
    3030#include "IDLTypes.h"
    3131#include "JSDOMPromiseDeferred.h"
     32#include "MediaKeySystemRequestIdentifier.h"
    3233#include <wtf/CompletionHandler.h>
    3334#include <wtf/Forward.h>
    … …  
    4142
    4243template <typename IDLType> class DOMPromiseDeferred;
    43 
    44 enum MediaKeySystemRequestIdentifierType { };
    45 using MediaKeySystemRequestIdentifier = ObjectIdentifier<MediaKeySystemRequestIdentifierType>;
    4644
    4745class MediaKeySystemRequest : public RefCounted<MediaKeySystemRequest>, public ActiveDOMObject {

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

    r281360 r281376  
    340340                0F73B769222B3A0C00805316 /* ScrollingTreeOverflowScrollingNodeMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FC0516A219B5EBE0031C39E /* ScrollingTreeOverflowScrollingNodeMac.h */; settings = {ATTRIBUTES = (Private, ); }; };
    341341                0F768C2D26D03841008DBE0B /* UserMediaRequestIdentifier.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F768C2B26D03841008DBE0B /* UserMediaRequestIdentifier.h */; settings = {ATTRIBUTES = (Private, ); }; };
     342                0F768C3526D0AB39008DBE0B /* MediaKeySystemRequestIdentifier.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F768C3326D0AB39008DBE0B /* MediaKeySystemRequestIdentifier.h */; settings = {ATTRIBUTES = (Private, ); }; };
    342343                0F790F432517CE6E009BA034 /* DisplayView.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F790F3F2517CE6D009BA034 /* DisplayView.h */; };
    343344                0F7D07331884C56C00B4AF86 /* PlatformTextTrack.h in Headers */ = {isa = PBXBuildFile; fileRef = 072847E216EBC5B00043CFA4 /* PlatformTextTrack.h */; settings = {ATTRIBUTES = (Private, ); }; };
    … …  
    62336234                0F73B765222B327F00805316 /* ScrollingStateScrollingNodeMac.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = ScrollingStateScrollingNodeMac.mm; sourceTree = "<group>"; };
    62346235                0F768C2B26D03841008DBE0B /* UserMediaRequestIdentifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserMediaRequestIdentifier.h; sourceTree = "<group>"; };
     6236                0F768C3326D0AB39008DBE0B /* MediaKeySystemRequestIdentifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaKeySystemRequestIdentifier.h; sourceTree = "<group>"; };
    62356237                0F790F3D2517CE6D009BA034 /* DisplayView.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DisplayView.cpp; sourceTree = "<group>"; };
    62366238                0F790F3F2517CE6D009BA034 /* DisplayView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DisplayView.h; sourceTree = "<group>"; };
    … …  
    2802328025                                9ACC079425C725ED00DC6386 /* MediaKeySystemRequest.cpp */,
    2802428026                                9ACC07A525C810DF00DC6386 /* MediaKeySystemRequest.h */,
     28027                                0F768C3326D0AB39008DBE0B /* MediaKeySystemRequestIdentifier.h */,
    2802528028                                2D9BF6FC1DBFB71F007A7D99 /* Navigator+EME.idl */,
    2802628029                                2D9BF7401DBFDC0F007A7D99 /* NavigatorEME.cpp */,
    … …  
    3358633589                                9ACC07AF25C8141D00DC6386 /* MediaKeySystemController.h in Headers */,
    3358733590                                9ACC07A625C810DF00DC6386 /* MediaKeySystemRequest.h in Headers */,
     33591                                0F768C3526D0AB39008DBE0B /* MediaKeySystemRequestIdentifier.h in Headers */,
    3358833592                                A8EA800E0A19516E00A8EF5F /* MediaList.h in Headers */,
    3358933593                                0782894825C23FE500A7BA03 /* MediaMetadata.h in Headers */,

  • trunk/Source/WebKit/ChangeLog

    r281365 r281376  
     12021-08-21  Simon Fraser  <simon.fraser@apple.com>
     2
     3        Use MediaKeySystemRequestIdentifier, rather than mysterious uint64_t values, in WebKit
     4        https://bugs.webkit.org/show_bug.cgi?id=229310
     5
     6        Reviewed by Youenn Fablet.
     7
     8        WebCore already had an ObjectIdentifer<> type for media system key requests, MediaKeySystemRequestIdentifier.
     9        Use it in the WebKit layer.
     10
     11        * Scripts/webkit/messages.py:
     12        (types_that_cannot_be_forward_declared):
     13        (headers_for_type):
     14        * UIProcess/MediaKeySystemPermissionRequestManagerProxy.cpp:
     15        (WebKit::MediaKeySystemPermissionRequestManagerProxy::denyRequest):
     16        (WebKit::MediaKeySystemPermissionRequestManagerProxy::grantRequest):
     17        (WebKit::MediaKeySystemPermissionRequestManagerProxy::createRequestForFrame):
     18        * UIProcess/MediaKeySystemPermissionRequestManagerProxy.h:
     19        * UIProcess/MediaKeySystemPermissionRequestProxy.cpp:
     20        (WebKit::MediaKeySystemPermissionRequestProxy::MediaKeySystemPermissionRequestProxy):
     21        * UIProcess/MediaKeySystemPermissionRequestProxy.h:
     22        (WebKit::MediaKeySystemPermissionRequestProxy::create):
     23        (WebKit::MediaKeySystemPermissionRequestProxy::mediaKeySystemID const):
     24        * UIProcess/WebPageProxy.cpp:
     25        (WebKit::WebPageProxy::requestMediaKeySystemPermissionForFrame):
     26        * UIProcess/WebPageProxy.h:
     27        * UIProcess/WebPageProxy.messages.in:
     28        * WebProcess/EncryptedMedia/MediaKeySystemPermissionRequestManager.cpp:
     29        (WebKit::MediaKeySystemPermissionRequestManager::sendMediaKeySystemRequest):
     30        (WebKit::MediaKeySystemPermissionRequestManager::mediaKeySystemWasGranted):
     31        (WebKit::MediaKeySystemPermissionRequestManager::mediaKeySystemWasDenied):
     32        * WebProcess/EncryptedMedia/MediaKeySystemPermissionRequestManager.h:
     33        * WebProcess/WebPage/WebPage.cpp:
     34        (WebKit::WebPage::mediaKeySystemWasGranted):
     35        (WebKit::WebPage::mediaKeySystemWasDenied):
     36        * WebProcess/WebPage/WebPage.h:
     37        * WebProcess/WebPage/WebPage.messages.in:
     38
    1392021-08-20  Simon Fraser  <simon.fraser@apple.com>
    240

  • trunk/Source/WebKit/Scripts/webkit/messages.py

    r281360 r281376  
    286286        'WebCore::ImageDecoderIdentifier',
    287287        'WebCore::LibWebRTCSocketIdentifier',
     288        'WebCore::MediaKeySystemRequestIdentifier',
    288289        'WebCore::MediaPlayerIdentifier',
    289290        'WebCore::MediaSessionIdentifier',

  • trunk/Source/WebKit/UIProcess/MediaKeySystemPermissionRequestManagerProxy.cpp

    r272573 r281376  
    8787        return;
    8888
    89     ALWAYS_LOG(LOGIDENTIFIER, request.mediaKeySystemID(), ", reason: ", message);
     89    ALWAYS_LOG(LOGIDENTIFIER, request.mediaKeySystemID().toUInt64(), ", reason: ", message);
    9090
    9191#if ENABLE(ENCRYPTED_MEDIA)
    … …  
    102102
    103103#if ENABLE(ENCRYPTED_MEDIA)
    104     ALWAYS_LOG(LOGIDENTIFIER, request.mediaKeySystemID(), ", keySystem: ", request.keySystem());
     104    ALWAYS_LOG(LOGIDENTIFIER, request.mediaKeySystemID().toUInt64(), ", keySystem: ", request.keySystem());
    105105
    106106    m_page.sendWithAsyncReply(Messages::WebPage::MediaKeySystemWasGranted { request.mediaKeySystemID() }, [] { });
    … …  
    110110}
    111111
    112 Ref<MediaKeySystemPermissionRequestProxy> MediaKeySystemPermissionRequestManagerProxy::createRequestForFrame(uint64_t mediaKeySystemID, FrameIdentifier frameID, Ref<SecurityOrigin>&& topLevelDocumentOrigin, const String& keySystem)
     112Ref<MediaKeySystemPermissionRequestProxy> MediaKeySystemPermissionRequestManagerProxy::createRequestForFrame(MediaKeySystemRequestIdentifier mediaKeySystemID, FrameIdentifier frameID, Ref<SecurityOrigin>&& topLevelDocumentOrigin, const String& keySystem)
    113113{
    114     ALWAYS_LOG(LOGIDENTIFIER, mediaKeySystemID);
     114    ALWAYS_LOG(LOGIDENTIFIER, mediaKeySystemID.toUInt64());
    115115
    116116    auto request = MediaKeySystemPermissionRequestProxy::create(*this, mediaKeySystemID, m_page.mainFrame()->frameID(), frameID, WTFMove(topLevelDocumentOrigin), keySystem);

  • trunk/Source/WebKit/UIProcess/MediaKeySystemPermissionRequestManagerProxy.h

    r281360 r281376  
    5252    void invalidatePendingRequests();
    5353
    54     Ref<MediaKeySystemPermissionRequestProxy> createRequestForFrame(uint64_t mediaKeySystemID, WebCore::FrameIdentifier, Ref<WebCore::SecurityOrigin>&& topLevelDocumentOrigin, const String& keySystem);
     54    Ref<MediaKeySystemPermissionRequestProxy> createRequestForFrame(WebCore::MediaKeySystemRequestIdentifier, WebCore::FrameIdentifier, Ref<WebCore::SecurityOrigin>&& topLevelDocumentOrigin, const String& keySystem);
    5555
    5656    void grantRequest(MediaKeySystemPermissionRequestProxy&);
    … …  
    6565    WebPageProxy& m_page;
    6666
    67     HashMap<uint64_t, RefPtr<MediaKeySystemPermissionRequestProxy>> m_pendingRequests;
     67    HashMap<WebCore::MediaKeySystemRequestIdentifier, RefPtr<MediaKeySystemPermissionRequestProxy>> m_pendingRequests;
    6868    HashSet<String> m_validAuthorizationTokens;
    6969

  • trunk/Source/WebKit/UIProcess/MediaKeySystemPermissionRequestProxy.cpp

    r272573 r281376  
    3535using namespace WebCore;
    3636
    37 MediaKeySystemPermissionRequestProxy::MediaKeySystemPermissionRequestProxy(MediaKeySystemPermissionRequestManagerProxy& manager, uint64_t mediaKeySystemID, FrameIdentifier mainFrameID, FrameIdentifier frameID, Ref<WebCore::SecurityOrigin>&& topLevelDocumentOrigin, const String& keySystem)
     37MediaKeySystemPermissionRequestProxy::MediaKeySystemPermissionRequestProxy(MediaKeySystemPermissionRequestManagerProxy& manager, MediaKeySystemRequestIdentifier mediaKeySystemID, FrameIdentifier mainFrameID, FrameIdentifier frameID, Ref<WebCore::SecurityOrigin>&& topLevelDocumentOrigin, const String& keySystem)
    3838    : m_manager(makeWeakPtr(manager))
    3939    , m_mediaKeySystemID(mediaKeySystemID)

  • trunk/Source/WebKit/UIProcess/MediaKeySystemPermissionRequestProxy.h

    r272573 r281376  
    2828#include "APIObject.h"
    2929#include <WebCore/FrameIdentifier.h>
     30#include <WebCore/MediaKeySystemRequest.h>
     31#include <WebCore/MediaKeySystemRequestIdentifier.h>
    3032#include <wtf/Vector.h>
    3133#include <wtf/WeakPtr.h>
    … …  
    4244class MediaKeySystemPermissionRequestProxy : public RefCounted<MediaKeySystemPermissionRequestProxy> {
    4345public:
    44     static Ref<MediaKeySystemPermissionRequestProxy> create(MediaKeySystemPermissionRequestManagerProxy& manager, uint64_t mediaKeySystemID, WebCore::FrameIdentifier mainFrameID, WebCore::FrameIdentifier frameID, Ref<WebCore::SecurityOrigin>&& topLevelDocumentOrigin, const String& keySystem)
     46    static Ref<MediaKeySystemPermissionRequestProxy> create(MediaKeySystemPermissionRequestManagerProxy& manager, WebCore::MediaKeySystemRequestIdentifier mediaKeySystemID, WebCore::FrameIdentifier mainFrameID, WebCore::FrameIdentifier frameID, Ref<WebCore::SecurityOrigin>&& topLevelDocumentOrigin, const String& keySystem)
    4547    {
    4648        return adoptRef(*new MediaKeySystemPermissionRequestProxy(manager, mediaKeySystemID, mainFrameID, frameID, WTFMove(topLevelDocumentOrigin), keySystem));
    … …  
    5254    void invalidate();
    5355
    54     uint64_t mediaKeySystemID() const { return m_mediaKeySystemID; }
     56    WebCore::MediaKeySystemRequestIdentifier mediaKeySystemID() const { return m_mediaKeySystemID; }
    5557    WebCore::FrameIdentifier mainFrameID() const { return m_mainFrameID; }
    5658    WebCore::FrameIdentifier frameID() const { return m_frameID; }
    … …  
    6466
    6567private:
    66     MediaKeySystemPermissionRequestProxy(MediaKeySystemPermissionRequestManagerProxy&, uint64_t mediaKeySystemID, WebCore::FrameIdentifier mainFrameID, WebCore::FrameIdentifier, Ref<WebCore::SecurityOrigin>&& topLevelDocumentOrigin, const String& keySystem);
     68    MediaKeySystemPermissionRequestProxy(MediaKeySystemPermissionRequestManagerProxy&, WebCore::MediaKeySystemRequestIdentifier, WebCore::FrameIdentifier mainFrameID, WebCore::FrameIdentifier, Ref<WebCore::SecurityOrigin>&& topLevelDocumentOrigin, const String& keySystem);
    6769
    6870    WeakPtr<MediaKeySystemPermissionRequestManagerProxy> m_manager;
    69     uint64_t m_mediaKeySystemID;
     71    WebCore::MediaKeySystemRequestIdentifier m_mediaKeySystemID;
    7072    WebCore::FrameIdentifier m_mainFrameID;
    7173    WebCore::FrameIdentifier m_frameID;

  • trunk/Source/WebKit/UIProcess/WebPageProxy.cpp

    r281360 r281376  
    85608560}
    85618561
    8562 void WebPageProxy::requestMediaKeySystemPermissionForFrame(uint64_t mediaKeySystemID, FrameIdentifier frameID, const WebCore::SecurityOriginData& topLevelDocumentOriginData, const String& keySystem)
     8562void WebPageProxy::requestMediaKeySystemPermissionForFrame(MediaKeySystemRequestIdentifier mediaKeySystemID, FrameIdentifier frameID, const WebCore::SecurityOriginData& topLevelDocumentOriginData, const String& keySystem)
    85638563{
    85648564#if ENABLE(ENCRYPTED_MEDIA)

  • trunk/Source/WebKit/UIProcess/WebPageProxy.h

    r281360 r281376  
    21332133    MediaKeySystemPermissionRequestManagerProxy& mediaKeySystemPermissionRequestManager();
    21342134#endif
    2135     void requestMediaKeySystemPermissionForFrame(uint64_t mediaKeySystemID, WebCore::FrameIdentifier, const WebCore::SecurityOriginData& topLevelDocumentOriginIdentifier, const String&);
     2135    void requestMediaKeySystemPermissionForFrame(WebCore::MediaKeySystemRequestIdentifier, WebCore::FrameIdentifier, const WebCore::SecurityOriginData& topLevelDocumentOriginIdentifier, const String&);
    21362136
    21372137    void runModal();

  • trunk/Source/WebKit/UIProcess/WebPageProxy.messages.in

    r281360 r281376  
    276276
    277277#if ENABLE(ENCRYPTED_MEDIA)
    278     RequestMediaKeySystemPermissionForFrame(uint64_t mediaKeySystemID, WebCore::FrameIdentifier frameID, struct WebCore::SecurityOriginData topLevelDocumentOriginIdentifier, String keySystem)
     278    RequestMediaKeySystemPermissionForFrame(WebCore::MediaKeySystemRequestIdentifier mediaKeySystemID, WebCore::FrameIdentifier frameID, struct WebCore::SecurityOriginData topLevelDocumentOriginIdentifier, String keySystem)
    279279#endif
    280280

  • trunk/Source/WebKit/WebProcess/EncryptedMedia/MediaKeySystemPermissionRequestManager.cpp

    r275883 r281376  
    8383
    8484    auto* topLevelDocumentOrigin = userRequest.topLevelDocumentOrigin();
    85     m_page.send(Messages::WebPageProxy::RequestMediaKeySystemPermissionForFrame(userRequest.identifier().toUInt64(), webFrame->frameID(), topLevelDocumentOrigin->data(), userRequest.keySystem()));
     85    m_page.send(Messages::WebPageProxy::RequestMediaKeySystemPermissionForFrame(userRequest.identifier(), webFrame->frameID(), topLevelDocumentOrigin->data(), userRequest.keySystem()));
    8686}
    8787
    … …  
    120120}
    121121
    122 void MediaKeySystemPermissionRequestManager::mediaKeySystemWasGranted(uint64_t requestID, CompletionHandler<void()>&& completionHandler)
     122void MediaKeySystemPermissionRequestManager::mediaKeySystemWasGranted(MediaKeySystemRequestIdentifier requestID, CompletionHandler<void()>&& completionHandler)
    123123{
    124     auto request = m_ongoingMediaKeySystemRequests.take(makeObjectIdentifier<MediaKeySystemRequestIdentifierType>(requestID));
     124    auto request = m_ongoingMediaKeySystemRequests.take(requestID);
    125125    if (!request) {
    126126        completionHandler();
    … …  
    131131}
    132132
    133 void MediaKeySystemPermissionRequestManager::mediaKeySystemWasDenied(uint64_t requestID, String&& message)
     133void MediaKeySystemPermissionRequestManager::mediaKeySystemWasDenied(MediaKeySystemRequestIdentifier requestID, String&& message)
    134134{
    135     auto request = m_ongoingMediaKeySystemRequests.take(makeObjectIdentifier<MediaKeySystemRequestIdentifierType>(requestID));
     135    auto request = m_ongoingMediaKeySystemRequests.take(requestID);
    136136    if (!request)
    137137        return;

  • trunk/Source/WebKit/WebProcess/EncryptedMedia/MediaKeySystemPermissionRequestManager.h

    r275883 r281376  
    4848    void startMediaKeySystemRequest(WebCore::MediaKeySystemRequest&);
    4949    void cancelMediaKeySystemRequest(WebCore::MediaKeySystemRequest&);
    50     void mediaKeySystemWasGranted(uint64_t, CompletionHandler<void()>&&);
    51     void mediaKeySystemWasDenied(uint64_t, String&&);
     50    void mediaKeySystemWasGranted(WebCore::MediaKeySystemRequestIdentifier, CompletionHandler<void()>&&);
     51    void mediaKeySystemWasDenied(WebCore::MediaKeySystemRequestIdentifier, String&&);
    5252
    5353private:

  • trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp

    r281360 r281376  
    47354735
    47364736#if ENABLE(ENCRYPTED_MEDIA)
    4737 void WebPage::mediaKeySystemWasGranted(uint64_t mediaKeySystemID, CompletionHandler<void()>&& completionHandler)
     4737void WebPage::mediaKeySystemWasGranted(MediaKeySystemRequestIdentifier mediaKeySystemID, CompletionHandler<void()>&& completionHandler)
    47384738{
    47394739    m_mediaKeySystemPermissionRequestManager->mediaKeySystemWasGranted(mediaKeySystemID, WTFMove(completionHandler));
    47404740}
    47414741
    4742 void WebPage::mediaKeySystemWasDenied(uint64_t mediaKeySystemID, String&& message)
     4742void WebPage::mediaKeySystemWasDenied(MediaKeySystemRequestIdentifier mediaKeySystemID, String&& message)
    47434743{
    47444744    m_mediaKeySystemPermissionRequestManager->mediaKeySystemWasDenied(mediaKeySystemID, WTFMove(message));

  • trunk/Source/WebKit/WebProcess/WebPage/WebPage.h

    r281360 r281376  
    7777#include <WebCore/IntSizeHash.h>
    7878#include <WebCore/MediaControlsContextMenuItem.h>
     79#include <WebCore/MediaKeySystemRequest.h>
    7980#include <WebCore/Page.h>
    8081#include <WebCore/PageIdentifier.h>
    … …  
    17711772
    17721773#if ENABLE(ENCRYPTED_MEDIA)
    1773     void mediaKeySystemWasGranted(uint64_t mediaKeySystemID, CompletionHandler<void()>&&);
    1774     void mediaKeySystemWasDenied(uint64_t mediaKeySystemID, String&& message);
     1774    void mediaKeySystemWasGranted(WebCore::MediaKeySystemRequestIdentifier, CompletionHandler<void()>&&);
     1775    void mediaKeySystemWasDenied(WebCore::MediaKeySystemRequestIdentifier, String&& message);
    17751776#endif
    17761777

  • trunk/Source/WebKit/WebProcess/WebPage/WebPage.messages.in

    r281360 r281376  
    384384
    385385#if ENABLE(ENCRYPTED_MEDIA)
    386     MediaKeySystemWasGranted(uint64_t mediaKeySystemID) -> () Async
    387     MediaKeySystemWasDenied(uint64_t mediaKeySystemID, String message)
     386    MediaKeySystemWasGranted(WebCore::MediaKeySystemRequestIdentifier mediaKeySystemID) -> () Async
     387    MediaKeySystemWasDenied(WebCore::MediaKeySystemRequestIdentifier mediaKeySystemID, String message)
    388388#endif
    389389
Note: See TracChangeset for help on using the changeset viewer.