Changeset 206983 in webkit


Ignore:
Timestamp:
Oct 9, 2016 11:21:52 PM (8 years ago)
Author:
zandobersek@gmail.com
Message:

ENABLE_LEGACY_ENCRYPTED_MEDIA interfaces should have a hard-coded WebKit prefix
​https://bugs.webkit.org/show_bug.cgi?id=162982

Reviewed by Jer Noble.

Have the Web-exposed interfaces guarded by ENABLE_LEGACY_ENCRYPTED_MEDIA also use
the WebKit prefix in the implementations. This will prevent conflicts between
interfaces with same names in both the legacy API and the future EME API.

Most of the interfaces in this legacy API already used the WebKit prefix when
exposed via JS bindings. The only exception is MediaKeyNeededEvent, which gets
prefixed in this patch.

The interface implementations for this legacy API are also moved under the
Modules/encryptedmedia/legacy/ directory.

No new tests -- covered by existing tests (with the relevant changes reflected
in the updated baselines).

  • CMakeLists.txt:
  • DerivedSources.cpp:
  • DerivedSources.make:
  • Modules/encryptedmedia/CDM.cpp:
  • Modules/encryptedmedia/CDMSessionClearKey.cpp:

(WebCore::CDMSessionClearKey::generateKeyRequest):
(WebCore::CDMSessionClearKey::update):

  • Modules/encryptedmedia/legacy/WebKitMediaKeyMessageEvent.cpp: Renamed from Source/WebCore/Modules/encryptedmedia/MediaKeyMessageEvent.cpp.

(WebCore::WebKitMediaKeyMessageEvent::WebKitMediaKeyMessageEvent):
(WebCore::WebKitMediaKeyMessageEvent::~WebKitMediaKeyMessageEvent):
(WebCore::WebKitMediaKeyMessageEvent::eventInterface):

  • Modules/encryptedmedia/legacy/WebKitMediaKeyMessageEvent.h: Renamed from Source/WebCore/Modules/encryptedmedia/MediaKeyMessageEvent.h.

(WebCore::WebKitMediaKeyMessageEvent::create):
(WebCore::WebKitMediaKeyMessageEvent::createForBindings):

  • Modules/encryptedmedia/legacy/WebKitMediaKeyMessageEvent.idl: Renamed from Source/WebCore/Modules/encryptedmedia/MediaKeyMessageEvent.idl.
  • Modules/encryptedmedia/legacy/WebKitMediaKeyNeededEvent.cpp: Renamed from Source/WebCore/Modules/encryptedmedia/MediaKeyNeededEvent.cpp.

(WebCore::WebKitMediaKeyNeededEvent::WebKitMediaKeyNeededEvent):
(WebCore::WebKitMediaKeyNeededEvent::~WebKitMediaKeyNeededEvent):
(WebCore::WebKitMediaKeyNeededEvent::eventInterface):

  • Modules/encryptedmedia/legacy/WebKitMediaKeyNeededEvent.h: Renamed from Source/WebCore/Modules/encryptedmedia/MediaKeyNeededEvent.h.

(WebCore::WebKitMediaKeyNeededEvent::create):
(WebCore::WebKitMediaKeyNeededEvent::createForBindings):

  • Modules/encryptedmedia/legacy/WebKitMediaKeyNeededEvent.idl: Renamed from Source/WebCore/Modules/encryptedmedia/MediaKeyNeededEvent.idl.
  • Modules/encryptedmedia/legacy/WebKitMediaKeySession.cpp: Renamed from Source/WebCore/Modules/encryptedmedia/MediaKeySession.cpp.

(WebCore::WebKitMediaKeySession::create):
(WebCore::WebKitMediaKeySession::WebKitMediaKeySession):
(WebCore::WebKitMediaKeySession::~WebKitMediaKeySession):
(WebCore::WebKitMediaKeySession::setError):
(WebCore::WebKitMediaKeySession::close):
(WebCore::WebKitMediaKeySession::cachedKeyForKeyId):
(WebCore::WebKitMediaKeySession::sessionId):
(WebCore::WebKitMediaKeySession::generateKeyRequest):
(WebCore::WebKitMediaKeySession::keyRequestTimerFired):
(WebCore::WebKitMediaKeySession::update):
(WebCore::WebKitMediaKeySession::addKeyTimerFired):
(WebCore::WebKitMediaKeySession::sendMessage):
(WebCore::WebKitMediaKeySession::sendError):
(WebCore::WebKitMediaKeySession::mediaKeysStorageDirectory):
(WebCore::WebKitMediaKeySession::hasPendingActivity):
(WebCore::WebKitMediaKeySession::stop):
(WebCore::WebKitMediaKeySession::activeDOMObjectName):
(WebCore::WebKitMediaKeySession::canSuspendForDocumentSuspension):

  • Modules/encryptedmedia/legacy/WebKitMediaKeySession.h: Renamed from Source/WebCore/Modules/encryptedmedia/MediaKeySession.h.
  • Modules/encryptedmedia/legacy/WebKitMediaKeySession.idl: Renamed from Source/WebCore/Modules/encryptedmedia/MediaKeySession.idl.
  • Modules/encryptedmedia/legacy/WebKitMediaKeys.cpp: Renamed from Source/WebCore/Modules/encryptedmedia/MediaKeys.cpp.

(WebCore::WebKitMediaKeys::create):
(WebCore::WebKitMediaKeys::WebKitMediaKeys):
(WebCore::WebKitMediaKeys::~WebKitMediaKeys):
(WebCore::WebKitMediaKeys::createSession):
(WebCore::WebKitMediaKeys::isTypeSupported):
(WebCore::WebKitMediaKeys::setMediaElement):
(WebCore::WebKitMediaKeys::cdmMediaPlayer):
(WebCore::WebKitMediaKeys::keyAdded):
(WebCore::WebKitMediaKeys::cachedKeyForKeyId):

  • Modules/encryptedmedia/legacy/WebKitMediaKeys.h: Renamed from Source/WebCore/Modules/encryptedmedia/MediaKeys.h.
  • Modules/encryptedmedia/legacy/WebKitMediaKeys.idl: Renamed from Source/WebCore/Modules/encryptedmedia/MediaKeys.idl.
  • bindings/js/JSDictionary.cpp:

(WebCore::JSDictionary::convertValue):

  • bindings/js/JSDictionary.h:
  • dom/EventNames.in:
  • dom/EventTargetFactory.in:
  • html/HTMLMediaElement.cpp:

(WebCore::HTMLMediaElement::mediaPlayerKeyNeeded):
(WebCore::HTMLMediaElement::setMediaKeys):

  • html/HTMLMediaElement.h:

(WebCore::HTMLMediaElement::keys):

  • html/HTMLMediaElement.idl:
  • html/WebKitMediaKeyError.h: Renamed from Source/WebCore/html/MediaKeyError.h.

(WebCore::WebKitMediaKeyError::create):
(WebCore::WebKitMediaKeyError::WebKitMediaKeyError):

  • html/WebKitMediaKeyError.idl: Renamed from Source/WebCore/html/MediaKeyError.idl.
  • testing/MockCDM.cpp:

(WebCore::MockCDMSession::generateKeyRequest):
(WebCore::MockCDMSession::update):

Location:
trunk
Files:
1 added
20 edited
14 moved

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/platform/efl/js/dom/global-constructors-attributes-expected.txt

    r204732 r206983  
    839839PASS Object.getOwnPropertyDescriptor(global, 'MediaError').enumerable is false
    840840PASS Object.getOwnPropertyDescriptor(global, 'MediaError').configurable is true
    841 PASS Object.getOwnPropertyDescriptor(global, 'MediaKeyNeededEvent').value is MediaKeyNeededEvent
    842 PASS Object.getOwnPropertyDescriptor(global, 'MediaKeyNeededEvent').hasOwnProperty('get') is false
    843 PASS Object.getOwnPropertyDescriptor(global, 'MediaKeyNeededEvent').hasOwnProperty('set') is false
    844 PASS Object.getOwnPropertyDescriptor(global, 'MediaKeyNeededEvent').enumerable is false
    845 PASS Object.getOwnPropertyDescriptor(global, 'MediaKeyNeededEvent').configurable is true
    846841PASS Object.getOwnPropertyDescriptor(global, 'MediaList').value is MediaList
    847842PASS Object.getOwnPropertyDescriptor(global, 'MediaList').hasOwnProperty('get') is false
    … …  
    20742069PASS Object.getOwnPropertyDescriptor(global, 'WebKitMediaKeyMessageEvent').enumerable is false
    20752070PASS Object.getOwnPropertyDescriptor(global, 'WebKitMediaKeyMessageEvent').configurable is true
     2071PASS Object.getOwnPropertyDescriptor(global, 'WebKitMediaKeyNeededEvent').value is WebKitMediaKeyNeededEvent
     2072PASS Object.getOwnPropertyDescriptor(global, 'WebKitMediaKeyNeededEvent').hasOwnProperty('get') is false
     2073PASS Object.getOwnPropertyDescriptor(global, 'WebKitMediaKeyNeededEvent').hasOwnProperty('set') is false
     2074PASS Object.getOwnPropertyDescriptor(global, 'WebKitMediaKeyNeededEvent').enumerable is false
     2075PASS Object.getOwnPropertyDescriptor(global, 'WebKitMediaKeyNeededEvent').configurable is true
    20762076PASS Object.getOwnPropertyDescriptor(global, 'WebKitMediaKeySession').value is WebKitMediaKeySession
    20772077PASS Object.getOwnPropertyDescriptor(global, 'WebKitMediaKeySession').hasOwnProperty('get') is false

  • trunk/LayoutTests/platform/mac-wk1/js/dom/global-constructors-attributes-expected.txt

    r206963 r206983  
    959959PASS Object.getOwnPropertyDescriptor(global, 'MediaError').enumerable is false
    960960PASS Object.getOwnPropertyDescriptor(global, 'MediaError').configurable is true
    961 PASS Object.getOwnPropertyDescriptor(global, 'MediaKeyNeededEvent').value is MediaKeyNeededEvent
    962 PASS Object.getOwnPropertyDescriptor(global, 'MediaKeyNeededEvent').hasOwnProperty('get') is false
    963 PASS Object.getOwnPropertyDescriptor(global, 'MediaKeyNeededEvent').hasOwnProperty('set') is false
    964 PASS Object.getOwnPropertyDescriptor(global, 'MediaKeyNeededEvent').enumerable is false
    965 PASS Object.getOwnPropertyDescriptor(global, 'MediaKeyNeededEvent').configurable is true
    966961PASS Object.getOwnPropertyDescriptor(global, 'MediaList').value is MediaList
    967962PASS Object.getOwnPropertyDescriptor(global, 'MediaList').hasOwnProperty('get') is false
    … …  
    23242319PASS Object.getOwnPropertyDescriptor(global, 'WebKitMediaKeyMessageEvent').enumerable is false
    23252320PASS Object.getOwnPropertyDescriptor(global, 'WebKitMediaKeyMessageEvent').configurable is true
     2321PASS Object.getOwnPropertyDescriptor(global, 'WebKitMediaKeyNeededEvent').value is WebKitMediaKeyNeededEvent
     2322PASS Object.getOwnPropertyDescriptor(global, 'WebKitMediaKeyNeededEvent').hasOwnProperty('get') is false
     2323PASS Object.getOwnPropertyDescriptor(global, 'WebKitMediaKeyNeededEvent').hasOwnProperty('set') is false
     2324PASS Object.getOwnPropertyDescriptor(global, 'WebKitMediaKeyNeededEvent').enumerable is false
     2325PASS Object.getOwnPropertyDescriptor(global, 'WebKitMediaKeyNeededEvent').configurable is true
    23262326PASS Object.getOwnPropertyDescriptor(global, 'WebKitMediaKeySession').value is WebKitMediaKeySession
    23272327PASS Object.getOwnPropertyDescriptor(global, 'WebKitMediaKeySession').hasOwnProperty('get') is false

  • trunk/LayoutTests/platform/mac-yosemite/js/dom/global-constructors-attributes-expected.txt

    r206963 r206983  
    974974PASS Object.getOwnPropertyDescriptor(global, 'MediaError').enumerable is false
    975975PASS Object.getOwnPropertyDescriptor(global, 'MediaError').configurable is true
    976 PASS Object.getOwnPropertyDescriptor(global, 'MediaKeyNeededEvent').value is MediaKeyNeededEvent
    977 PASS Object.getOwnPropertyDescriptor(global, 'MediaKeyNeededEvent').hasOwnProperty('get') is false
    978 PASS Object.getOwnPropertyDescriptor(global, 'MediaKeyNeededEvent').hasOwnProperty('set') is false
    979 PASS Object.getOwnPropertyDescriptor(global, 'MediaKeyNeededEvent').enumerable is false
    980 PASS Object.getOwnPropertyDescriptor(global, 'MediaKeyNeededEvent').configurable is true
    981976PASS Object.getOwnPropertyDescriptor(global, 'MediaList').value is MediaList
    982977PASS Object.getOwnPropertyDescriptor(global, 'MediaList').hasOwnProperty('get') is false
    … …  
    23392334PASS Object.getOwnPropertyDescriptor(global, 'WebKitMediaKeyMessageEvent').enumerable is false
    23402335PASS Object.getOwnPropertyDescriptor(global, 'WebKitMediaKeyMessageEvent').configurable is true
     2336PASS Object.getOwnPropertyDescriptor(global, 'WebKitMediaKeyNeededEvent').value is WebKitMediaKeyNeededEvent
     2337PASS Object.getOwnPropertyDescriptor(global, 'WebKitMediaKeyNeededEvent').hasOwnProperty('get') is false
     2338PASS Object.getOwnPropertyDescriptor(global, 'WebKitMediaKeyNeededEvent').hasOwnProperty('set') is false
     2339PASS Object.getOwnPropertyDescriptor(global, 'WebKitMediaKeyNeededEvent').enumerable is false
     2340PASS Object.getOwnPropertyDescriptor(global, 'WebKitMediaKeyNeededEvent').configurable is true
    23412341PASS Object.getOwnPropertyDescriptor(global, 'WebKitMediaKeySession').value is WebKitMediaKeySession
    23422342PASS Object.getOwnPropertyDescriptor(global, 'WebKitMediaKeySession').hasOwnProperty('get') is false

  • trunk/LayoutTests/platform/mac/js/dom/global-constructors-attributes-expected.txt

    r206963 r206983  
    974974PASS Object.getOwnPropertyDescriptor(global, 'MediaError').enumerable is false
    975975PASS Object.getOwnPropertyDescriptor(global, 'MediaError').configurable is true
    976 PASS Object.getOwnPropertyDescriptor(global, 'MediaKeyNeededEvent').value is MediaKeyNeededEvent
    977 PASS Object.getOwnPropertyDescriptor(global, 'MediaKeyNeededEvent').hasOwnProperty('get') is false
    978 PASS Object.getOwnPropertyDescriptor(global, 'MediaKeyNeededEvent').hasOwnProperty('set') is false
    979 PASS Object.getOwnPropertyDescriptor(global, 'MediaKeyNeededEvent').enumerable is false
    980 PASS Object.getOwnPropertyDescriptor(global, 'MediaKeyNeededEvent').configurable is true
    981976PASS Object.getOwnPropertyDescriptor(global, 'MediaList').value is MediaList
    982977PASS Object.getOwnPropertyDescriptor(global, 'MediaList').hasOwnProperty('get') is false
    … …  
    23392334PASS Object.getOwnPropertyDescriptor(global, 'WebKitMediaKeyMessageEvent').enumerable is false
    23402335PASS Object.getOwnPropertyDescriptor(global, 'WebKitMediaKeyMessageEvent').configurable is true
     2336PASS Object.getOwnPropertyDescriptor(global, 'WebKitMediaKeyNeededEvent').value is WebKitMediaKeyNeededEvent
     2337PASS Object.getOwnPropertyDescriptor(global, 'WebKitMediaKeyNeededEvent').hasOwnProperty('get') is false
     2338PASS Object.getOwnPropertyDescriptor(global, 'WebKitMediaKeyNeededEvent').hasOwnProperty('set') is false
     2339PASS Object.getOwnPropertyDescriptor(global, 'WebKitMediaKeyNeededEvent').enumerable is false
     2340PASS Object.getOwnPropertyDescriptor(global, 'WebKitMediaKeyNeededEvent').configurable is true
    23412341PASS Object.getOwnPropertyDescriptor(global, 'WebKitMediaKeySession').value is WebKitMediaKeySession
    23422342PASS Object.getOwnPropertyDescriptor(global, 'WebKitMediaKeySession').hasOwnProperty('get') is false

  • trunk/LayoutTests/platform/win/js/dom/global-constructors-attributes-expected.txt

    r206963 r206983  
    749749PASS Object.getOwnPropertyDescriptor(global, 'MediaError').enumerable is false
    750750PASS Object.getOwnPropertyDescriptor(global, 'MediaError').configurable is true
    751 PASS Object.getOwnPropertyDescriptor(global, 'MediaKeyNeededEvent').value is MediaKeyNeededEvent
    752 PASS Object.getOwnPropertyDescriptor(global, 'MediaKeyNeededEvent').hasOwnProperty('get') is false
    753 PASS Object.getOwnPropertyDescriptor(global, 'MediaKeyNeededEvent').hasOwnProperty('set') is false
    754 PASS Object.getOwnPropertyDescriptor(global, 'MediaKeyNeededEvent').enumerable is false
    755 PASS Object.getOwnPropertyDescriptor(global, 'MediaKeyNeededEvent').configurable is true
    756751PASS Object.getOwnPropertyDescriptor(global, 'MediaList').value is MediaList
    757752PASS Object.getOwnPropertyDescriptor(global, 'MediaList').hasOwnProperty('get') is false
    … …  
    17941789PASS Object.getOwnPropertyDescriptor(global, 'WebKitMediaKeyMessageEvent').enumerable is false
    17951790PASS Object.getOwnPropertyDescriptor(global, 'WebKitMediaKeyMessageEvent').configurable is true
     1791PASS Object.getOwnPropertyDescriptor(global, 'WebKitMediaKeyNeededEvent').value is WebKitMediaKeyNeededEvent
     1792PASS Object.getOwnPropertyDescriptor(global, 'WebKitMediaKeyNeededEvent').hasOwnProperty('get') is false
     1793PASS Object.getOwnPropertyDescriptor(global, 'WebKitMediaKeyNeededEvent').hasOwnProperty('set') is false
     1794PASS Object.getOwnPropertyDescriptor(global, 'WebKitMediaKeyNeededEvent').enumerable is false
     1795PASS Object.getOwnPropertyDescriptor(global, 'WebKitMediaKeyNeededEvent').configurable is true
    17961796PASS Object.getOwnPropertyDescriptor(global, 'WebKitMediaKeySession').value is WebKitMediaKeySession
    17971797PASS Object.getOwnPropertyDescriptor(global, 'WebKitMediaKeySession').hasOwnProperty('get') is false

  • trunk/Source/WebCore/CMakeLists.txt

    r206972 r206983  
    99    "${WEBCORE_DIR}/Modules/battery"
    1010    "${WEBCORE_DIR}/Modules/encryptedmedia"
     11    "${WEBCORE_DIR}/Modules/encryptedmedia/legacy"
    1112    "${WEBCORE_DIR}/Modules/fetch"
    1213    "${WEBCORE_DIR}/Modules/geolocation"
    … …  
    139140    Modules/airplay
    140141    Modules/battery
    141     Modules/encryptedmedia
     142    Modules/encryptedmedia/legacy
    142143    Modules/fetch
    143144    Modules/geolocation
    … …  
    29993000        Modules/encryptedmedia/CDMPrivateMediaPlayer.cpp
    30003001        Modules/encryptedmedia/CDMSessionClearKey.cpp
    3001         Modules/encryptedmedia/MediaKeyMessageEvent.cpp
    3002         Modules/encryptedmedia/MediaKeyNeededEvent.cpp
    3003         Modules/encryptedmedia/MediaKeySession.cpp
    3004         Modules/encryptedmedia/MediaKeys.cpp
     3002
     3003        Modules/encryptedmedia/legacy/WebKitMediaKeyMessageEvent.cpp
     3004        Modules/encryptedmedia/legacy/WebKitMediaKeyNeededEvent.cpp
     3005        Modules/encryptedmedia/legacy/WebKitMediaKeySession.cpp
     3006        Modules/encryptedmedia/legacy/WebKitMediaKeys.cpp
    30053007    )
    30063008    list(APPEND WebCoreTestSupport_SOURCES
    … …  
    30083010    )
    30093011    list(APPEND WebCore_IDL_FILES
    3010         Modules/encryptedmedia/MediaKeyMessageEvent.idl
    3011         Modules/encryptedmedia/MediaKeyNeededEvent.idl
    3012         Modules/encryptedmedia/MediaKeySession.idl
    3013         Modules/encryptedmedia/MediaKeys.idl
    3014 
    3015         html/MediaKeyError.idl
     3012        Modules/encryptedmedia/legacy/WebKitMediaKeyMessageEvent.idl
     3013        Modules/encryptedmedia/legacy/WebKitMediaKeyNeededEvent.idl
     3014        Modules/encryptedmedia/legacy/WebKitMediaKeySession.idl
     3015        Modules/encryptedmedia/legacy/WebKitMediaKeys.idl
     3016
     3017        html/WebKitMediaKeyError.idl
    30163018    )
    30173019endif ()

  • trunk/Source/WebCore/ChangeLog

    r206982 r206983  
     12016-10-09  Zan Dobersek  <zdobersek@igalia.com>
     2
     3        ENABLE_LEGACY_ENCRYPTED_MEDIA interfaces should have a hard-coded WebKit prefix
     4        https://bugs.webkit.org/show_bug.cgi?id=162982
     5
     6        Reviewed by Jer Noble.
     7
     8        Have the Web-exposed interfaces guarded by ENABLE_LEGACY_ENCRYPTED_MEDIA also use
     9        the WebKit prefix in the implementations. This will prevent conflicts between
     10        interfaces with same names in both the legacy API and the future EME API.
     11
     12        Most of the interfaces in this legacy API already used the WebKit prefix when
     13        exposed via JS bindings. The only exception is MediaKeyNeededEvent, which gets
     14        prefixed in this patch.
     15
     16        The interface implementations for this legacy API are also moved under the
     17        Modules/encryptedmedia/legacy/ directory.
     18
     19        No new tests -- covered by existing tests (with the relevant changes reflected
     20        in the updated baselines).
     21
     22        * CMakeLists.txt:
     23        * DerivedSources.cpp:
     24        * DerivedSources.make:
     25        * Modules/encryptedmedia/CDM.cpp:
     26        * Modules/encryptedmedia/CDMSessionClearKey.cpp:
     27        (WebCore::CDMSessionClearKey::generateKeyRequest):
     28        (WebCore::CDMSessionClearKey::update):
     29        * Modules/encryptedmedia/legacy/WebKitMediaKeyMessageEvent.cpp: Renamed from Source/WebCore/Modules/encryptedmedia/MediaKeyMessageEvent.cpp.
     30        (WebCore::WebKitMediaKeyMessageEvent::WebKitMediaKeyMessageEvent):
     31        (WebCore::WebKitMediaKeyMessageEvent::~WebKitMediaKeyMessageEvent):
     32        (WebCore::WebKitMediaKeyMessageEvent::eventInterface):
     33        * Modules/encryptedmedia/legacy/WebKitMediaKeyMessageEvent.h: Renamed from Source/WebCore/Modules/encryptedmedia/MediaKeyMessageEvent.h.
     34        (WebCore::WebKitMediaKeyMessageEvent::create):
     35        (WebCore::WebKitMediaKeyMessageEvent::createForBindings):
     36        * Modules/encryptedmedia/legacy/WebKitMediaKeyMessageEvent.idl: Renamed from Source/WebCore/Modules/encryptedmedia/MediaKeyMessageEvent.idl.
     37        * Modules/encryptedmedia/legacy/WebKitMediaKeyNeededEvent.cpp: Renamed from Source/WebCore/Modules/encryptedmedia/MediaKeyNeededEvent.cpp.
     38        (WebCore::WebKitMediaKeyNeededEvent::WebKitMediaKeyNeededEvent):
     39        (WebCore::WebKitMediaKeyNeededEvent::~WebKitMediaKeyNeededEvent):
     40        (WebCore::WebKitMediaKeyNeededEvent::eventInterface):
     41        * Modules/encryptedmedia/legacy/WebKitMediaKeyNeededEvent.h: Renamed from Source/WebCore/Modules/encryptedmedia/MediaKeyNeededEvent.h.
     42        (WebCore::WebKitMediaKeyNeededEvent::create):
     43        (WebCore::WebKitMediaKeyNeededEvent::createForBindings):
     44        * Modules/encryptedmedia/legacy/WebKitMediaKeyNeededEvent.idl: Renamed from Source/WebCore/Modules/encryptedmedia/MediaKeyNeededEvent.idl.
     45        * Modules/encryptedmedia/legacy/WebKitMediaKeySession.cpp: Renamed from Source/WebCore/Modules/encryptedmedia/MediaKeySession.cpp.
     46        (WebCore::WebKitMediaKeySession::create):
     47        (WebCore::WebKitMediaKeySession::WebKitMediaKeySession):
     48        (WebCore::WebKitMediaKeySession::~WebKitMediaKeySession):
     49        (WebCore::WebKitMediaKeySession::setError):
     50        (WebCore::WebKitMediaKeySession::close):
     51        (WebCore::WebKitMediaKeySession::cachedKeyForKeyId):
     52        (WebCore::WebKitMediaKeySession::sessionId):
     53        (WebCore::WebKitMediaKeySession::generateKeyRequest):
     54        (WebCore::WebKitMediaKeySession::keyRequestTimerFired):
     55        (WebCore::WebKitMediaKeySession::update):
     56        (WebCore::WebKitMediaKeySession::addKeyTimerFired):
     57        (WebCore::WebKitMediaKeySession::sendMessage):
     58        (WebCore::WebKitMediaKeySession::sendError):
     59        (WebCore::WebKitMediaKeySession::mediaKeysStorageDirectory):
     60        (WebCore::WebKitMediaKeySession::hasPendingActivity):
     61        (WebCore::WebKitMediaKeySession::stop):
     62        (WebCore::WebKitMediaKeySession::activeDOMObjectName):
     63        (WebCore::WebKitMediaKeySession::canSuspendForDocumentSuspension):
     64        * Modules/encryptedmedia/legacy/WebKitMediaKeySession.h: Renamed from Source/WebCore/Modules/encryptedmedia/MediaKeySession.h.
     65        * Modules/encryptedmedia/legacy/WebKitMediaKeySession.idl: Renamed from Source/WebCore/Modules/encryptedmedia/MediaKeySession.idl.
     66        * Modules/encryptedmedia/legacy/WebKitMediaKeys.cpp: Renamed from Source/WebCore/Modules/encryptedmedia/MediaKeys.cpp.
     67        (WebCore::WebKitMediaKeys::create):
     68        (WebCore::WebKitMediaKeys::WebKitMediaKeys):
     69        (WebCore::WebKitMediaKeys::~WebKitMediaKeys):
     70        (WebCore::WebKitMediaKeys::createSession):
     71        (WebCore::WebKitMediaKeys::isTypeSupported):
     72        (WebCore::WebKitMediaKeys::setMediaElement):
     73        (WebCore::WebKitMediaKeys::cdmMediaPlayer):
     74        (WebCore::WebKitMediaKeys::keyAdded):
     75        (WebCore::WebKitMediaKeys::cachedKeyForKeyId):
     76        * Modules/encryptedmedia/legacy/WebKitMediaKeys.h: Renamed from Source/WebCore/Modules/encryptedmedia/MediaKeys.h.
     77        * Modules/encryptedmedia/legacy/WebKitMediaKeys.idl: Renamed from Source/WebCore/Modules/encryptedmedia/MediaKeys.idl.
     78        * bindings/js/JSDictionary.cpp:
     79        (WebCore::JSDictionary::convertValue):
     80        * bindings/js/JSDictionary.h:
     81        * dom/EventNames.in:
     82        * dom/EventTargetFactory.in:
     83        * html/HTMLMediaElement.cpp:
     84        (WebCore::HTMLMediaElement::mediaPlayerKeyNeeded):
     85        (WebCore::HTMLMediaElement::setMediaKeys):
     86        * html/HTMLMediaElement.h:
     87        (WebCore::HTMLMediaElement::keys):
     88        * html/HTMLMediaElement.idl:
     89        * html/WebKitMediaKeyError.h: Renamed from Source/WebCore/html/MediaKeyError.h.
     90        (WebCore::WebKitMediaKeyError::create):
     91        (WebCore::WebKitMediaKeyError::WebKitMediaKeyError):
     92        * html/WebKitMediaKeyError.idl: Renamed from Source/WebCore/html/MediaKeyError.idl.
     93        * testing/MockCDM.cpp:
     94        (WebCore::MockCDMSession::generateKeyRequest):
     95        (WebCore::MockCDMSession::update):
     96
    1972016-10-09  Zan Dobersek  <zdobersek@igalia.com>
    298

  • trunk/Source/WebCore/DerivedSources.cpp

    r206971 r206983  
    330330#include "JSMediaError.cpp"
    331331#include "JSMediaList.cpp"
    332 #if ENABLE(LEGACY_ENCRYPTED_MEDIA)
    333 #include "JSMediaKeyError.cpp"
    334 #include "JSMediaKeyMessageEvent.cpp"
    335 #include "JSMediaKeyNeededEvent.cpp"
    336 #include "JSMediaKeySession.cpp"
    337 #include "JSMediaKeys.cpp"
    338 #endif
    339332#include "JSMediaQueryList.cpp"
    340333#include "JSMediaQueryListListener.cpp"
    … …  
    650643#include "JSWebKitCSSRegionRule.cpp"
    651644#include "JSWebKitCSSViewportRule.cpp"
     645#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
     646#include "JSWebKitMediaKeyError.cpp"
     647#include "JSWebKitMediaKeyMessageEvent.cpp"
     648#include "JSWebKitMediaKeyNeededEvent.cpp"
     649#include "JSWebKitMediaKeySession.cpp"
     650#include "JSWebKitMediaKeys.cpp"
     651#endif
    652652#include "JSWebKitNamedFlow.cpp"
    653653#include "JSWebKitPlaybackTargetAvailabilityEvent.cpp"

  • trunk/Source/WebCore/DerivedSources.make

    r206971 r206983  
    3131    $(WebCore)/Modules/airplay \
    3232    $(WebCore)/Modules/applepay \
    33     $(WebCore)/Modules/encryptedmedia \
     33    $(WebCore)/Modules/encryptedmedia/legacy \
    3434    $(WebCore)/Modules/fetch \
    3535    $(WebCore)/Modules/gamepad \
    … …  
    8383    $(WebCore)/Modules/applepay/ApplePayShippingMethodSelectedEvent.idl \
    8484    $(WebCore)/Modules/applepay/ApplePayValidateMerchantEvent.idl \
    85     $(WebCore)/Modules/encryptedmedia/MediaKeyMessageEvent.idl \
    86     $(WebCore)/Modules/encryptedmedia/MediaKeyNeededEvent.idl \
    87     $(WebCore)/Modules/encryptedmedia/MediaKeySession.idl \
    88     $(WebCore)/Modules/encryptedmedia/MediaKeys.idl \
     85    $(WebCore)/Modules/encryptedmedia/legacy/WebKitMediaKeyMessageEvent.idl \
     86    $(WebCore)/Modules/encryptedmedia/legacy/WebKitMediaKeyNeededEvent.idl \
     87    $(WebCore)/Modules/encryptedmedia/legacy/WebKitMediaKeySession.idl \
     88    $(WebCore)/Modules/encryptedmedia/legacy/WebKitMediaKeys.idl \
    8989    $(WebCore)/Modules/fetch/DOMWindowFetch.idl \
    9090    $(WebCore)/Modules/fetch/FetchBody.idl \
    … …  
    448448    $(WebCore)/html/MediaController.idl \
    449449    $(WebCore)/html/MediaError.idl \
    450     $(WebCore)/html/MediaKeyError.idl \
    451450    $(WebCore)/html/RadioNodeList.idl \
    452451    $(WebCore)/html/TextMetrics.idl \
    … …  
    456455    $(WebCore)/html/ValidityState.idl \
    457456    $(WebCore)/html/VoidCallback.idl \
     457    $(WebCore)/html/WebKitMediaKeyError.idl \
    458458    $(WebCore)/html/canvas/ANGLEInstancedArrays.idl \
    459459    $(WebCore)/html/canvas/CanvasGradient.idl \

  • trunk/Source/WebCore/Modules/encryptedmedia/CDM.cpp

    r206811 r206983  
    3333#include "CDMPrivateMediaPlayer.h"
    3434#include "CDMSession.h"
    35 #include "MediaKeyError.h"
    36 #include "MediaKeys.h"
    3735#include "MediaPlayer.h"
     36#include "WebKitMediaKeys.h"
    3837#include <wtf/NeverDestroyed.h>
    3938#include <wtf/text/WTFString.h>

  • trunk/Source/WebCore/Modules/encryptedmedia/CDMSessionClearKey.cpp

    r206811 r206983  
    3535#include "JSMainThreadExecState.h"
    3636#include "Logging.h"
    37 #include "MediaKeyError.h"
    3837#include "TextEncoding.h"
    3938#include "UUID.h"
     39#include "WebKitMediaKeyError.h"
    4040#include <runtime/JSGlobalObject.h>
    4141#include <runtime/JSLock.h>
    … …  
    7777
    7878    if (!initData) {
    79         errorCode = MediaKeyError::MEDIA_KEYERR_CLIENT;
     79        errorCode = WebKitMediaKeyError::MEDIA_KEYERR_CLIENT;
    8080        return nullptr;
    8181    }
    … …  
    8585    String keyID = UTF8Encoding().decode(reinterpret_cast_ptr<char*>(m_initData->baseAddress()), m_initData->byteLength(), true, sawError);
    8686    if (sawError) {
    87         errorCode = MediaKeyError::MEDIA_KEYERR_CLIENT;
     87        errorCode = WebKitMediaKeyError::MEDIA_KEYERR_CLIENT;
    8888        return nullptr;
    8989    }
    … …  
    177177    } while (false);
    178178
    179     errorCode = MediaKeyError::MEDIA_KEYERR_CLIENT;
     179    errorCode = WebKitMediaKeyError::MEDIA_KEYERR_CLIENT;
    180180    return false;
    181181}

  • trunk/Source/WebCore/Modules/encryptedmedia/legacy/WebKitMediaKeyMessageEvent.cpp

    r206982 r206983  
    2525
    2626#include "config.h"
     27#include "WebKitMediaKeyMessageEvent.h"
    2728
    2829#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
    29 
    30 #include "MediaKeyMessageEvent.h"
    3130
    3231#include "EventNames.h"
    … …  
    3534namespace WebCore {
    3635
    37 MediaKeyMessageEvent::MediaKeyMessageEvent(const AtomicString& type, Uint8Array* message, const String& destinationURL)
     36WebKitMediaKeyMessageEvent::WebKitMediaKeyMessageEvent(const AtomicString& type, Uint8Array* message, const String& destinationURL)
    3837    : Event(type, false, false)
    3938    , m_message(message)
    … …  
    4342
    4443
    45 MediaKeyMessageEvent::MediaKeyMessageEvent(const AtomicString& type, const MediaKeyMessageEventInit& initializer)
     44WebKitMediaKeyMessageEvent::WebKitMediaKeyMessageEvent(const AtomicString& type, const WebKitMediaKeyMessageEventInit& initializer)
    4645    : Event(type, initializer)
    4746    , m_message(initializer.message)
    … …  
    5049}
    5150
    52 MediaKeyMessageEvent::~MediaKeyMessageEvent()
     51WebKitMediaKeyMessageEvent::~WebKitMediaKeyMessageEvent()
    5352{
    5453}
    5554
    56 EventInterface MediaKeyMessageEvent::eventInterface() const
     55EventInterface WebKitMediaKeyMessageEvent::eventInterface() const
    5756{
    58     return MediaKeyMessageEventInterfaceType;
     57    return WebKitMediaKeyMessageEventInterfaceType;
    5958}
    6059

  • trunk/Source/WebCore/Modules/encryptedmedia/legacy/WebKitMediaKeyMessageEvent.h

    r206982 r206983  
    2525 */
    2626
    27 #ifndef MediaKeyMessageEvent_h
    28 #define MediaKeyMessageEvent_h
     27#ifndef WebKitMediaKeyMessageEvent_h
     28#define WebKitMediaKeyMessageEvent_h
    2929
    3030#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
    3131
    3232#include "Event.h"
    33 #include "MediaKeyError.h"
     33#include "WebKitMediaKeyError.h"
    3434
    3535namespace WebCore {
    3636
    37 struct MediaKeyMessageEventInit : public EventInit {
     37struct WebKitMediaKeyMessageEventInit : public EventInit {
    3838    RefPtr<Uint8Array> message;
    3939    String destinationURL;
    4040};
    4141
    42 class MediaKeyMessageEvent : public Event {
     42class WebKitMediaKeyMessageEvent : public Event {
    4343public:
    44     virtual ~MediaKeyMessageEvent();
     44    virtual ~WebKitMediaKeyMessageEvent();
    4545
    46     static Ref<MediaKeyMessageEvent> create(const AtomicString& type, Uint8Array* message, const String& destinationURL)
     46    static Ref<WebKitMediaKeyMessageEvent> create(const AtomicString& type, Uint8Array* message, const String& destinationURL)
    4747    {
    48         return adoptRef(*new MediaKeyMessageEvent(type, message, destinationURL));
     48        return adoptRef(*new WebKitMediaKeyMessageEvent(type, message, destinationURL));
    4949    }
    5050
    51     static Ref<MediaKeyMessageEvent> createForBindings(const AtomicString& type, const MediaKeyMessageEventInit& initializer)
     51    static Ref<WebKitMediaKeyMessageEvent> createForBindings(const AtomicString& type, const WebKitMediaKeyMessageEventInit& initializer)
    5252    {
    53         return adoptRef(*new MediaKeyMessageEvent(type, initializer));
     53        return adoptRef(*new WebKitMediaKeyMessageEvent(type, initializer));
    5454    }
    5555
    … …  
    6060
    6161private:
    62     MediaKeyMessageEvent(const AtomicString& type, Uint8Array* message, const String& destinationURL);
    63     MediaKeyMessageEvent(const AtomicString& type, const MediaKeyMessageEventInit& initializer);
     62    WebKitMediaKeyMessageEvent(const AtomicString& type, Uint8Array* message, const String& destinationURL);
     63    WebKitMediaKeyMessageEvent(const AtomicString& type, const WebKitMediaKeyMessageEventInit& initializer);
    6464
    6565    RefPtr<Uint8Array> m_message;

  • trunk/Source/WebCore/Modules/encryptedmedia/legacy/WebKitMediaKeyMessageEvent.idl

    r206982 r206983  
    2727    Conditional=LEGACY_ENCRYPTED_MEDIA,
    2828    ConstructorTemplate=Event,
    29     InterfaceName=WebKitMediaKeyMessageEvent
    30 ] interface MediaKeyMessageEvent : Event {
     29] interface WebKitMediaKeyMessageEvent : Event {
    3130    readonly attribute Uint8Array message;
    3231    [InitializedByEventConstructor] readonly attribute DOMString destinationURL;

  • trunk/Source/WebCore/Modules/encryptedmedia/legacy/WebKitMediaKeyNeededEvent.cpp

    r206982 r206983  
    2525
    2626#include "config.h"
     27#include "WebKitMediaKeyNeededEvent.h"
    2728
    2829#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
    29 
    30 #include "MediaKeyNeededEvent.h"
    3130
    3231#include "EventNames.h"
    … …  
    3534namespace WebCore {
    3635
    37 MediaKeyNeededEvent::MediaKeyNeededEvent(const AtomicString& type, Uint8Array* initData)
     36WebKitMediaKeyNeededEvent::WebKitMediaKeyNeededEvent(const AtomicString& type, Uint8Array* initData)
    3837    : Event(type, false, false)
    3938    , m_initData(initData)
    … …  
    4140}
    4241
    43 MediaKeyNeededEvent::MediaKeyNeededEvent(const AtomicString& type, const MediaKeyNeededEventInit& initializer)
     42WebKitMediaKeyNeededEvent::WebKitMediaKeyNeededEvent(const AtomicString& type, const WebKitMediaKeyNeededEventInit& initializer)
    4443    : Event(type, initializer)
    4544    , m_initData(initializer.initData)
    … …  
    4746}
    4847
    49 MediaKeyNeededEvent::~MediaKeyNeededEvent()
     48WebKitMediaKeyNeededEvent::~WebKitMediaKeyNeededEvent()
    5049{
    5150}
    5251
    53 EventInterface MediaKeyNeededEvent::eventInterface() const
     52EventInterface WebKitMediaKeyNeededEvent::eventInterface() const
    5453{
    55     return MediaKeyNeededEventInterfaceType;
     54    return WebKitMediaKeyNeededEventInterfaceType;
    5655}
    5756

  • trunk/Source/WebCore/Modules/encryptedmedia/legacy/WebKitMediaKeyNeededEvent.h

    r206982 r206983  
    2424 */
    2525
    26 #ifndef MediaKeyNeededEvent_h
    27 #define MediaKeyNeededEvent_h
     26#ifndef WebKitMediaKeyNeededEvent_h
     27#define WebKitMediaKeyNeededEvent_h
    2828
    2929#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
    3030
    3131#include "Event.h"
    32 #include "MediaKeyError.h"
     32#include "WebKitMediaKeyError.h"
    3333
    3434namespace WebCore {
    3535
    36 struct MediaKeyNeededEventInit : public EventInit {
     36struct WebKitMediaKeyNeededEventInit : public EventInit {
    3737    RefPtr<Uint8Array> initData;
    3838};
    3939
    40 class MediaKeyNeededEvent : public Event {
     40class WebKitMediaKeyNeededEvent : public Event {
    4141public:
    42     virtual ~MediaKeyNeededEvent();
     42    virtual ~WebKitMediaKeyNeededEvent();
    4343
    44     static Ref<MediaKeyNeededEvent> create(const AtomicString& type, Uint8Array* initData)
     44    static Ref<WebKitMediaKeyNeededEvent> create(const AtomicString& type, Uint8Array* initData)
    4545    {
    46         return adoptRef(*new MediaKeyNeededEvent(type, initData));
     46        return adoptRef(*new WebKitMediaKeyNeededEvent(type, initData));
    4747    }
    4848
    49     static Ref<MediaKeyNeededEvent> createForBindings(const AtomicString& type, const MediaKeyNeededEventInit& initializer)
     49    static Ref<WebKitMediaKeyNeededEvent> createForBindings(const AtomicString& type, const WebKitMediaKeyNeededEventInit& initializer)
    5050    {
    51         return adoptRef(*new MediaKeyNeededEvent(type, initializer));
     51        return adoptRef(*new WebKitMediaKeyNeededEvent(type, initializer));
    5252    }
    5353
    … …  
    5757
    5858private:
    59     MediaKeyNeededEvent(const AtomicString& type, Uint8Array* initData);
    60     MediaKeyNeededEvent(const AtomicString& type, const MediaKeyNeededEventInit& initializer);
     59    WebKitMediaKeyNeededEvent(const AtomicString& type, Uint8Array* initData);
     60    WebKitMediaKeyNeededEvent(const AtomicString& type, const WebKitMediaKeyNeededEventInit& initializer);
    6161
    6262    RefPtr<Uint8Array> m_initData;

  • trunk/Source/WebCore/Modules/encryptedmedia/legacy/WebKitMediaKeyNeededEvent.idl

    r206982 r206983  
    2727    Conditional=LEGACY_ENCRYPTED_MEDIA,
    2828    ConstructorTemplate=Event
    29 ] interface MediaKeyNeededEvent : Event {
     29] interface WebKitMediaKeyNeededEvent : Event {
    3030    readonly attribute Uint8Array initData;
    3131};

  • trunk/Source/WebCore/Modules/encryptedmedia/legacy/WebKitMediaKeySession.cpp

    r206982 r206983  
    2525
    2626#include "config.h"
    27 #include "MediaKeySession.h"
     27#include "WebKitMediaKeySession.h"
    2828
    2929#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
    … …  
    3636#include "FileSystem.h"
    3737#include "GenericEventQueue.h"
    38 #include "MediaKeyError.h"
    39 #include "MediaKeyMessageEvent.h"
    40 #include "MediaKeys.h"
    4138#include "Settings.h"
     39#include "WebKitMediaKeyError.h"
     40#include "WebKitMediaKeyMessageEvent.h"
     41#include "WebKitMediaKeys.h"
    4242
    4343namespace WebCore {
    4444
    45 Ref<MediaKeySession> MediaKeySession::create(ScriptExecutionContext& context, MediaKeys* keys, const String& keySystem)
    46 {
    47     auto session = adoptRef(*new MediaKeySession(context, keys, keySystem));
     45Ref<WebKitMediaKeySession> WebKitMediaKeySession::create(ScriptExecutionContext& context, WebKitMediaKeys* keys, const String& keySystem)
     46{
     47    auto session = adoptRef(*new WebKitMediaKeySession(context, keys, keySystem));
    4848    session->suspendIfNeeded();
    4949    return session;
    5050}
    5151
    52 MediaKeySession::MediaKeySession(ScriptExecutionContext& context, MediaKeys* keys, const String& keySystem)
     52WebKitMediaKeySession::WebKitMediaKeySession(ScriptExecutionContext& context, WebKitMediaKeys* keys, const String& keySystem)
    5353    : ActiveDOMObject(&context)
    5454    , m_keys(keys)
    … …  
    5656    , m_asyncEventQueue(*this)
    5757    , m_session(keys->cdm()->createSession(this))
    58     , m_keyRequestTimer(*this, &MediaKeySession::keyRequestTimerFired)
    59     , m_addKeyTimer(*this, &MediaKeySession::addKeyTimerFired)
    60 {
    61 }
    62 
    63 MediaKeySession::~MediaKeySession()
     58    , m_keyRequestTimer(*this, &WebKitMediaKeySession::keyRequestTimerFired)
     59    , m_addKeyTimer(*this, &WebKitMediaKeySession::addKeyTimerFired)
     60{
     61}
     62
     63WebKitMediaKeySession::~WebKitMediaKeySession()
    6464{
    6565    if (m_session) {
    … …  
    7171}
    7272
    73 void MediaKeySession::setError(MediaKeyError* error)
     73void WebKitMediaKeySession::setError(WebKitMediaKeyError* error)
    7474{
    7575    m_error = error;
    7676}
    7777
    78 void MediaKeySession::close()
     78void WebKitMediaKeySession::close()
    7979{
    8080    if (m_session)
    … …  
    8282}
    8383
    84 RefPtr<ArrayBuffer> MediaKeySession::cachedKeyForKeyId(const String& keyId) const
     84RefPtr<ArrayBuffer> WebKitMediaKeySession::cachedKeyForKeyId(const String& keyId) const
    8585{
    8686    return m_session ? m_session->cachedKeyForKeyID(keyId) : nullptr;
    8787}
    8888
    89 const String& MediaKeySession::sessionId() const
     89const String& WebKitMediaKeySession::sessionId() const
    9090{
    9191    return m_session->sessionId();
    9292}
    9393
    94 void MediaKeySession::generateKeyRequest(const String& mimeType, Ref<Uint8Array>&& initData)
     94void WebKitMediaKeySession::generateKeyRequest(const String& mimeType, Ref<Uint8Array>&& initData)
    9595{
    9696    m_pendingKeyRequests.append({ mimeType, WTFMove(initData) });
    … …  
    9898}
    9999
    100 void MediaKeySession::keyRequestTimerFired()
     100void WebKitMediaKeySession::keyRequestTimerFired()
    101101{
    102102    ASSERT(m_pendingKeyRequests.size());
    … …  
    113113        // 2. Let destinationURL be null.
    114114        String destinationURL;
    115         MediaKeyError::Code errorCode = 0;
     115        WebKitMediaKeyError::Code errorCode = 0;
    116116        uint32_t systemCode = 0;
    117117
    … …  
    141141}
    142142
    143 void MediaKeySession::update(Ref<Uint8Array>&& key, ExceptionCode& ec)
     143void WebKitMediaKeySession::update(Ref<Uint8Array>&& key, ExceptionCode& ec)
    144144{
    145145    // From <http://dvcs.w3.org/hg/html-media/raw-file/tip/encrypted-media/encrypted-media.html#dom-addkey>:
    … …  
    157157}
    158158
    159 void MediaKeySession::addKeyTimerFired()
     159void WebKitMediaKeySession::addKeyTimerFired()
    160160{
    161161    ASSERT(m_pendingKeys.size());
    … …  
    210210}
    211211
    212 void MediaKeySession::sendMessage(Uint8Array* message, String destinationURL)
    213 {
    214     auto event = MediaKeyMessageEvent::create(eventNames().webkitkeymessageEvent, message, destinationURL);
     212void WebKitMediaKeySession::sendMessage(Uint8Array* message, String destinationURL)
     213{
     214    auto event = WebKitMediaKeyMessageEvent::create(eventNames().webkitkeymessageEvent, message, destinationURL);
    215215    event->setTarget(this);
    216216    m_asyncEventQueue.enqueueEvent(WTFMove(event));
    217217}
    218218
    219 void MediaKeySession::sendError(CDMSessionClient::MediaKeyErrorCode errorCode, uint32_t systemCode)
    220 {
    221     Ref<MediaKeyError> error = MediaKeyError::create(errorCode, systemCode).get();
     219void WebKitMediaKeySession::sendError(CDMSessionClient::MediaKeyErrorCode errorCode, uint32_t systemCode)
     220{
     221    Ref<WebKitMediaKeyError> error = WebKitMediaKeyError::create(errorCode, systemCode).get();
    222222    setError(error.ptr());
    223223
    … …  
    227227}
    228228
    229 String MediaKeySession::mediaKeysStorageDirectory() const
     229String WebKitMediaKeySession::mediaKeysStorageDirectory() const
    230230{
    231231    Document* document = downcast<Document>(scriptExecutionContext());
    … …  
    248248}
    249249
    250 bool MediaKeySession::hasPendingActivity() const
     250bool WebKitMediaKeySession::hasPendingActivity() const
    251251{
    252252    return (m_keys && !isClosed()) || m_asyncEventQueue.hasPendingEvents();
    253253}
    254254
    255 void MediaKeySession::stop()
     255void WebKitMediaKeySession::stop()
    256256{
    257257    close();
    258258}
    259259
    260 const char* MediaKeySession::activeDOMObjectName() const
    261 {
    262     return "MediaKeySession";
    263 }
    264 
    265 bool MediaKeySession::canSuspendForDocumentSuspension() const
     260const char* WebKitMediaKeySession::activeDOMObjectName() const
     261{
     262    return "WebKitMediaKeySession";
     263}
     264
     265bool WebKitMediaKeySession::canSuspendForDocumentSuspension() const
    266266{
    267267    // FIXME: We should try and do better here.

  • trunk/Source/WebCore/Modules/encryptedmedia/legacy/WebKitMediaKeySession.h

    r206982 r206983  
    2424 */
    2525
    26 #ifndef MediaKeySession_h
    27 #define MediaKeySession_h
     26#ifndef WebKitMediaKeySession_h
     27#define WebKitMediaKeySession_h
    2828
    2929#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
    … …  
    4242namespace WebCore {
    4343
    44 class MediaKeyError;
    45 class MediaKeys;
     44class WebKitMediaKeyError;
     45class WebKitMediaKeys;
    4646
    47 class MediaKeySession final : public RefCounted<MediaKeySession>, public EventTargetWithInlineData, public ActiveDOMObject, public CDMSessionClient {
     47class WebKitMediaKeySession final : public RefCounted<WebKitMediaKeySession>, public EventTargetWithInlineData, public ActiveDOMObject, public CDMSessionClient {
    4848public:
    49     static Ref<MediaKeySession> create(ScriptExecutionContext&, MediaKeys*, const String& keySystem);
    50     ~MediaKeySession();
     49    static Ref<WebKitMediaKeySession> create(ScriptExecutionContext&, WebKitMediaKeys*, const String& keySystem);
     50    ~WebKitMediaKeySession();
    5151
    5252    const String& keySystem() const { return m_keySystem; }
    … …  
    5454    const String& sessionId() const;
    5555
    56     void setError(MediaKeyError*);
    57     MediaKeyError* error() { return m_error.get(); }
     56    void setError(WebKitMediaKeyError*);
     57    WebKitMediaKeyError* error() { return m_error.get(); }
    5858
    59     void setKeys(MediaKeys* keys) { m_keys = keys; }
    60     MediaKeys* keys() const { return m_keys; }
     59    void setKeys(WebKitMediaKeys* keys) { m_keys = keys; }
     60    WebKitMediaKeys* keys() const { return m_keys; }
    6161
    6262    void generateKeyRequest(const String& mimeType, Ref<Uint8Array>&& initData);
    … …  
    6868    RefPtr<ArrayBuffer> cachedKeyForKeyId(const String& keyId) const;
    6969
    70     using RefCounted<MediaKeySession>::ref;
    71     using RefCounted<MediaKeySession>::deref;
     70    using RefCounted<WebKitMediaKeySession>::ref;
     71    using RefCounted<WebKitMediaKeySession>::deref;
    7272
    7373    void enqueueEvent(RefPtr<Event>&&);
    7474
    75     EventTargetInterface eventTargetInterface() const override { return MediaKeySessionEventTargetInterfaceType; }
     75    EventTargetInterface eventTargetInterface() const override { return WebKitMediaKeySessionEventTargetInterfaceType; }
    7676    ScriptExecutionContext* scriptExecutionContext() const override { return ActiveDOMObject::scriptExecutionContext(); }
    7777
    … …  
    8080
    8181protected:
    82     MediaKeySession(ScriptExecutionContext&, MediaKeys*, const String& keySystem);
     82    WebKitMediaKeySession(ScriptExecutionContext&, WebKitMediaKeys*, const String& keySystem);
    8383    void keyRequestTimerFired();
    8484    void addKeyTimerFired();
    … …  
    8989    String mediaKeysStorageDirectory() const override;
    9090
    91     MediaKeys* m_keys;
     91    WebKitMediaKeys* m_keys;
    9292    String m_keySystem;
    9393    String m_sessionId;
    94     RefPtr<MediaKeyError> m_error;
     94    RefPtr<WebKitMediaKeyError> m_error;
    9595    GenericEventQueue m_asyncEventQueue;
    9696    std::unique_ptr<CDMSession> m_session;
    … …  
    120120#endif // ENABLE(LEGACY_ENCRYPTED_MEDIA)
    121121
    122 #endif // MediaKeySession_h
     122#endif // WebKitMediaKeySession_h

  • trunk/Source/WebCore/Modules/encryptedmedia/legacy/WebKitMediaKeySession.idl

    r206982 r206983  
    2626[
    2727    Conditional=LEGACY_ENCRYPTED_MEDIA,
    28     InterfaceName=WebKitMediaKeySession,
    2928    ActiveDOMObject,
    30 ] interface MediaKeySession : EventTarget {
     29] interface WebKitMediaKeySession : EventTarget {
    3130    // error state
    32     readonly attribute MediaKeyError error;
     31    readonly attribute WebKitMediaKeyError error;
    3332
    3433    // session properties

  • trunk/Source/WebCore/Modules/encryptedmedia/legacy/WebKitMediaKeys.cpp

    r206982 r206983  
    2525
    2626#include "config.h"
    27 #include "MediaKeys.h"
     27#include "WebKitMediaKeys.h"
    2828
    2929#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
    … …  
    3232#include "EventNames.h"
    3333#include "HTMLMediaElement.h"
    34 #include "MediaKeyMessageEvent.h"
    35 #include "MediaKeySession.h"
    3634#include "UUID.h"
     35#include "WebKitMediaKeyMessageEvent.h"
     36#include "WebKitMediaKeySession.h"
    3737
    3838namespace WebCore {
    3939
    40 RefPtr<MediaKeys> MediaKeys::create(const String& keySystem, ExceptionCode& ec)
     40RefPtr<WebKitMediaKeys> WebKitMediaKeys::create(const String& keySystem, ExceptionCode& ec)
    4141{
    4242    // From <http://dvcs.w3.org/hg/html-media/raw-file/tip/encrypted-media/encrypted-media.html#dom-media-keys-constructor>:
    … …  
    6262    // 5.1 Let the keySystem attribute be keySystem.
    6363    // 6. Return the new object to the caller.
    64     return adoptRef(*new MediaKeys(keySystem, WTFMove(cdm)));
     64    return adoptRef(*new WebKitMediaKeys(keySystem, WTFMove(cdm)));
    6565}
    6666
    67 MediaKeys::MediaKeys(const String& keySystem, std::unique_ptr<CDM> cdm)
     67WebKitMediaKeys::WebKitMediaKeys(const String& keySystem, std::unique_ptr<CDM> cdm)
    6868    : m_mediaElement(nullptr)
    6969    , m_keySystem(keySystem)
    … …  
    7373}
    7474
    75 MediaKeys::~MediaKeys()
     75WebKitMediaKeys::~WebKitMediaKeys()
    7676{
    7777    // From <http://dvcs.w3.org/hg/html-media/raw-file/tip/encrypted-media/encrypted-media.html#dom-media-keys-constructor>:
    … …  
    8383}
    8484
    85 RefPtr<MediaKeySession> MediaKeys::createSession(ScriptExecutionContext& context, const String& type, Ref<Uint8Array>&& initData, ExceptionCode& ec)
     85RefPtr<WebKitMediaKeySession> WebKitMediaKeys::createSession(ScriptExecutionContext& context, const String& type, Ref<Uint8Array>&& initData, ExceptionCode& ec)
    8686{
    8787    // From <http://www.w3.org/TR/2014/WD-encrypted-media-20140218/#dom-createsession>:
    … …  
    111111    // 4.1 Let the keySystem attribute be keySystem.
    112112    // 4.2 Let the sessionId attribute be a unique Session ID string. It may be generated by cdm.
    113     auto session = MediaKeySession::create(context, this, keySystem());
     113    auto session = WebKitMediaKeySession::create(context, this, keySystem());
    114114
    115115    m_sessions.append(session.copyRef());
    … …  
    122122}
    123123
    124 bool MediaKeys::isTypeSupported(const String& keySystem, const String& mimeType)
     124bool WebKitMediaKeys::isTypeSupported(const String& keySystem, const String& mimeType)
    125125{
    126126    // 1. If keySystem contains an unrecognized or unsupported Key System, return false and abort these steps.
    … …  
    142142}
    143143
    144 void MediaKeys::setMediaElement(HTMLMediaElement* element)
     144void WebKitMediaKeys::setMediaElement(HTMLMediaElement* element)
    145145{
    146146    if (m_mediaElement && m_mediaElement->player())
    … …  
    153153}
    154154
    155 MediaPlayer* MediaKeys::cdmMediaPlayer(const CDM*) const
     155MediaPlayer* WebKitMediaKeys::cdmMediaPlayer(const CDM*) const
    156156{
    157157    if (m_mediaElement)
    … …  
    160160}
    161161
    162 void MediaKeys::keyAdded()
     162void WebKitMediaKeys::keyAdded()
    163163{
    164164    if (m_mediaElement)
    … …  
    167167}
    168168
    169 RefPtr<ArrayBuffer> MediaKeys::cachedKeyForKeyId(const String& keyId) const
     169RefPtr<ArrayBuffer> WebKitMediaKeys::cachedKeyForKeyId(const String& keyId) const
    170170{
    171171    for (auto& session : m_sessions) {

  • trunk/Source/WebCore/Modules/encryptedmedia/legacy/WebKitMediaKeys.h

    r206982 r206983  
    2424 */
    2525
    26 #ifndef MediaKeys_h
    27 #define MediaKeys_h
     26#ifndef WebKitMediaKeys_h
     27#define WebKitMediaKeys_h
    2828
    2929#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
    … …  
    3939namespace WebCore {
    4040
    41 class MediaKeySession;
    4241class HTMLMediaElement;
     42class WebKitMediaKeySession;
    4343
    44 class MediaKeys : public RefCounted<MediaKeys>, public CDMClient {
     44class WebKitMediaKeys : public RefCounted<WebKitMediaKeys>, public CDMClient {
    4545public:
    46     static RefPtr<MediaKeys> create(const String& keySystem, ExceptionCode&);
    47     virtual ~MediaKeys();
     46    static RefPtr<WebKitMediaKeys> create(const String& keySystem, ExceptionCode&);
     47    virtual ~WebKitMediaKeys();
    4848
    49     RefPtr<MediaKeySession> createSession(ScriptExecutionContext&, const String& mimeType, Ref<Uint8Array>&& initData, ExceptionCode&);
     49    RefPtr<WebKitMediaKeySession> createSession(ScriptExecutionContext&, const String& mimeType, Ref<Uint8Array>&& initData, ExceptionCode&);
    5050
    5151    static bool isTypeSupported(const String& keySystem, const String& mimeType);
    … …  
    6464    MediaPlayer* cdmMediaPlayer(const CDM*) const override;
    6565
    66     MediaKeys(const String& keySystem, std::unique_ptr<CDM>);
     66    WebKitMediaKeys(const String& keySystem, std::unique_ptr<CDM>);
    6767
    68     Vector<Ref<MediaKeySession>> m_sessions;
     68    Vector<Ref<WebKitMediaKeySession>> m_sessions;
    6969
    7070    HTMLMediaElement* m_mediaElement;
    … …  
    7777#endif // ENABLE(LEGACY_ENCRYPTED_MEDIA)
    7878
    79 #endif // MediaKeys_h
     79#endif // WebKitMediaKeys_h

  • trunk/Source/WebCore/Modules/encryptedmedia/legacy/WebKitMediaKeys.idl

    r206982 r206983  
    2828    Constructor(DOMString keySystem),
    2929    ConstructorMayThrowLegacyException,
    30     InterfaceName=WebKitMediaKeys,
    31 ] interface MediaKeys {
    32     [CallWith=ScriptExecutionContext, MayThrowLegacyException] MediaKeySession createSession(DOMString type, Uint8Array initData);
     30] interface WebKitMediaKeys {
     31    [CallWith=ScriptExecutionContext, MayThrowLegacyException] WebKitMediaKeySession createSession(DOMString type, Uint8Array initData);
    3332    static boolean isTypeSupported(DOMString keySystem, optional DOMString type);
    3433    readonly attribute DOMString keySystem;

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

    r206971 r206983  
    11561156                2BE8E2C712A589EC00FAD550 /* HTMLMetaCharsetParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 2BE8E2C612A589EC00FAD550 /* HTMLMetaCharsetParser.h */; };
    11571157                2BE8E2C912A58A0100FAD550 /* HTMLMetaCharsetParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BE8E2C812A58A0100FAD550 /* HTMLMetaCharsetParser.cpp */; };
     1158                2D0621441DA639B600A7FB26 /* WebKitMediaKeyMessageEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2D0621421DA6398800A7FB26 /* WebKitMediaKeyMessageEvent.cpp */; };
     1159                2D0621451DA639BA00A7FB26 /* WebKitMediaKeyMessageEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D0621431DA6398800A7FB26 /* WebKitMediaKeyMessageEvent.h */; };
     1160                2D06214D1DA63A8B00A7FB26 /* WebKitMediaKeys.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2D0621491DA63A7900A7FB26 /* WebKitMediaKeys.cpp */; };
     1161                2D06214E1DA63A8E00A7FB26 /* WebKitMediaKeys.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D06214A1DA63A7900A7FB26 /* WebKitMediaKeys.h */; };
     1162                2D06214F1DA63A9100A7FB26 /* WebKitMediaKeySession.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2D06214B1DA63A7900A7FB26 /* WebKitMediaKeySession.cpp */; };
     1163                2D0621501DA63A9400A7FB26 /* WebKitMediaKeySession.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D06214C1DA63A7900A7FB26 /* WebKitMediaKeySession.h */; };
     1164                2D0621511DA63A9F00A7FB26 /* WebKitMediaKeyNeededEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D0621481DA63A7900A7FB26 /* WebKitMediaKeyNeededEvent.h */; };
     1165                2D0621521DA63AA200A7FB26 /* WebKitMediaKeyNeededEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2D0621471DA63A7900A7FB26 /* WebKitMediaKeyNeededEvent.cpp */; };
    11581166                2D0B4AAB18DA1CCD00434DE1 /* IOSurface.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D0B4AA918DA1CCD00434DE1 /* IOSurface.h */; settings = {ATTRIBUTES = (Private, ); }; };
    11591167                2D0B4AAC18DA1CCD00434DE1 /* IOSurface.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D0B4AAA18DA1CCD00434DE1 /* IOSurface.mm */; };
    … …  
    55945602                CD127DEE14F3098400E84779 /* WebCoreFullScreenWindow.h in Headers */ = {isa = PBXBuildFile; fileRef = CD127DEA14F3097900E84779 /* WebCoreFullScreenWindow.h */; settings = {ATTRIBUTES = (Private, ); }; };
    55955603                CD19A2681A13E700008D650E /* DiagnosticLoggingClient.h in Headers */ = {isa = PBXBuildFile; fileRef = CD19A2671A13E700008D650E /* DiagnosticLoggingClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
    5596                 CD1B4A65160786AE00282DF9 /* MediaKeyNeededEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDA98DC216014EEE00FEA3B1 /* MediaKeyNeededEvent.cpp */; };
    55975604                CD1E7347167BC78E009A885D /* TextTrackRepresentation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD1E7346167BC78E009A885D /* TextTrackRepresentation.cpp */; };
    55985605                CD225C0B1C46FBF400140761 /* WebCoreNSURLSession.mm in Sources */ = {isa = PBXBuildFile; fileRef = CD225C091C46FBF400140761 /* WebCoreNSURLSession.mm */; };
    … …  
    57015708                CDA79827170A279100D45C55 /* AudioSessionIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = CDA79825170A279000D45C55 /* AudioSessionIOS.mm */; };
    57025709                CDA7982A170A3D0000D45C55 /* AudioSession.h in Headers */ = {isa = PBXBuildFile; fileRef = CDA79821170A22DC00D45C55 /* AudioSession.h */; settings = {ATTRIBUTES = (Private, ); }; };
    5703                 CDA98DA31601464100FEA3B1 /* JSMediaKeyError.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDA98D9B160128A500FEA3B1 /* JSMediaKeyError.cpp */; };
    5704                 CDA98DD816025BEF00FEA3B1 /* MediaKeyMessageEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDA98DD516025BED00FEA3B1 /* MediaKeyMessageEvent.cpp */; };
    5705                 CDA98DDF16026A3700FEA3B1 /* JSMediaKeyMessageEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDA98DDB16026A1800FEA3B1 /* JSMediaKeyMessageEvent.cpp */; };
    5706                 CDA98DE016026A3700FEA3B1 /* JSMediaKeyNeededEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDA98DDD16026A1900FEA3B1 /* JSMediaKeyNeededEvent.cpp */; };
    5707                 CDA98E0416039E1A00FEA3B1 /* JSMediaKeys.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDA98DCE1601597900FEA3B1 /* JSMediaKeys.cpp */; };
    5708                 CDA98E0616039E1F00FEA3B1 /* JSMediaKeySession.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDA98DD01601597900FEA3B1 /* JSMediaKeySession.cpp */; };
     5710                CDA98DA31601464100FEA3B1 /* JSWebKitMediaKeyError.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDA98D9B160128A500FEA3B1 /* JSWebKitMediaKeyError.cpp */; };
     5711                CDA98DDF16026A3700FEA3B1 /* JSWebKitMediaKeyMessageEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDA98DDB16026A1800FEA3B1 /* JSWebKitMediaKeyMessageEvent.cpp */; };
     5712                CDA98DE016026A3700FEA3B1 /* JSWebKitMediaKeyNeededEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDA98DDD16026A1900FEA3B1 /* JSWebKitMediaKeyNeededEvent.cpp */; };
     5713                CDA98E0416039E1A00FEA3B1 /* JSWebKitMediaKeys.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDA98DCE1601597900FEA3B1 /* JSWebKitMediaKeys.cpp */; };
     5714                CDA98E0616039E1F00FEA3B1 /* JSWebKitMediaKeySession.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDA98DD01601597900FEA3B1 /* JSWebKitMediaKeySession.cpp */; };
    57095715                CDA98E0B1603CD6000FEA3B1 /* CDM.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDA98E091603CD5900FEA3B1 /* CDM.cpp */; };
    5710                 CDA98E0D1603FE4A00FEA3B1 /* MediaKeys.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDA98DCA1601508A00FEA3B1 /* MediaKeys.cpp */; };
    5711                 CDA98E0E1603FE5800FEA3B1 /* MediaKeySession.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDA98DC716014F2C00FEA3B1 /* MediaKeySession.cpp */; };
    57125716                CDAA8D0A14D71B2E0061EA60 /* PlatformClockCM.mm in Sources */ = {isa = PBXBuildFile; fileRef = CDAA8D0814D385600061EA60 /* PlatformClockCM.mm */; };
    57135717                CDAB6D2817C7DE6C00C60B34 /* MediaControlsHost.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDAB6D2617C7DE6C00C60B34 /* MediaControlsHost.cpp */; };
    … …  
    80998103                2BE8E2C612A589EC00FAD550 /* HTMLMetaCharsetParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTMLMetaCharsetParser.h; sourceTree = "<group>"; };
    81008104                2BE8E2C812A58A0100FAD550 /* HTMLMetaCharsetParser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HTMLMetaCharsetParser.cpp; sourceTree = "<group>"; };
     8105                2D0621421DA6398800A7FB26 /* WebKitMediaKeyMessageEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebKitMediaKeyMessageEvent.cpp; sourceTree = "<group>"; };
     8106                2D0621431DA6398800A7FB26 /* WebKitMediaKeyMessageEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKitMediaKeyMessageEvent.h; sourceTree = "<group>"; };
     8107                2D0621471DA63A7900A7FB26 /* WebKitMediaKeyNeededEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebKitMediaKeyNeededEvent.cpp; sourceTree = "<group>"; };
     8108                2D0621481DA63A7900A7FB26 /* WebKitMediaKeyNeededEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKitMediaKeyNeededEvent.h; sourceTree = "<group>"; };
     8109                2D0621491DA63A7900A7FB26 /* WebKitMediaKeys.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebKitMediaKeys.cpp; sourceTree = "<group>"; };
     8110                2D06214A1DA63A7900A7FB26 /* WebKitMediaKeys.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKitMediaKeys.h; sourceTree = "<group>"; };
     8111                2D06214B1DA63A7900A7FB26 /* WebKitMediaKeySession.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebKitMediaKeySession.cpp; sourceTree = "<group>"; };
     8112                2D06214C1DA63A7900A7FB26 /* WebKitMediaKeySession.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKitMediaKeySession.h; sourceTree = "<group>"; };
     8113                2D0621531DA63ABF00A7FB26 /* WebKitMediaKeyMessageEvent.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = WebKitMediaKeyMessageEvent.idl; sourceTree = "<group>"; };
     8114                2D0621541DA63ABF00A7FB26 /* WebKitMediaKeyNeededEvent.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = WebKitMediaKeyNeededEvent.idl; sourceTree = "<group>"; };
     8115                2D0621551DA63ABF00A7FB26 /* WebKitMediaKeys.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = WebKitMediaKeys.idl; sourceTree = "<group>"; };
     8116                2D0621561DA63ABF00A7FB26 /* WebKitMediaKeySession.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = WebKitMediaKeySession.idl; sourceTree = "<group>"; };
    81018117                2D0B4AA918DA1CCD00434DE1 /* IOSurface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IOSurface.h; sourceTree = "<group>"; };
    81028118                2D0B4AAA18DA1CCD00434DE1 /* IOSurface.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = IOSurface.mm; sourceTree = "<group>"; };
    81038119                2D0CF8161BCF5DE1007A4937 /* NSWindowSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSWindowSPI.h; sourceTree = "<group>"; };
     8120                2D1932171DA64E1900A54A08 /* WebKitMediaKeyError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKitMediaKeyError.h; sourceTree = "<group>"; };
     8121                2D1932181DA64E1900A54A08 /* WebKitMediaKeyError.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = WebKitMediaKeyError.idl; sourceTree = "<group>"; };
    81048122                2D232BFF1A326EF9006BF2DB /* TUCallSPI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TUCallSPI.h; sourceTree = "<group>"; };
    81058123                2D25396018CE7F6200270222 /* ImageControlsButtonElementMac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ImageControlsButtonElementMac.cpp; sourceTree = "<group>"; };
    … …  
    1326313281                CDA79823170A258300D45C55 /* AudioSession.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AudioSession.cpp; sourceTree = "<group>"; };
    1326413282                CDA79825170A279000D45C55 /* AudioSessionIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AudioSessionIOS.mm; sourceTree = "<group>"; };
    13265                 CDA98D9B160128A500FEA3B1 /* JSMediaKeyError.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSMediaKeyError.cpp; sourceTree = "<group>"; };
    13266                 CDA98D9C160128A500FEA3B1 /* JSMediaKeyError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSMediaKeyError.h; sourceTree = "<group>"; };
    13267                 CDA98DC216014EEE00FEA3B1 /* MediaKeyNeededEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaKeyNeededEvent.cpp; sourceTree = "<group>"; };
    13268                 CDA98DC316014EEE00FEA3B1 /* MediaKeyNeededEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaKeyNeededEvent.h; sourceTree = "<group>"; };
    13269                 CDA98DC416014EEE00FEA3B1 /* MediaKeyNeededEvent.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = MediaKeyNeededEvent.idl; sourceTree = "<group>"; };
    13270                 CDA98DC716014F2C00FEA3B1 /* MediaKeySession.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaKeySession.cpp; sourceTree = "<group>"; };
    13271                 CDA98DC816014F2C00FEA3B1 /* MediaKeySession.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaKeySession.h; sourceTree = "<group>"; };
    13272                 CDA98DC916014F4000FEA3B1 /* MediaKeySession.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = MediaKeySession.idl; sourceTree = "<group>"; };
    13273                 CDA98DCA1601508A00FEA3B1 /* MediaKeys.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaKeys.cpp; sourceTree = "<group>"; };
    13274                 CDA98DCB1601508A00FEA3B1 /* MediaKeys.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaKeys.h; sourceTree = "<group>"; };
    13275                 CDA98DCC1601508A00FEA3B1 /* MediaKeys.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = MediaKeys.idl; sourceTree = "<group>"; };
    13276                 CDA98DCE1601597900FEA3B1 /* JSMediaKeys.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSMediaKeys.cpp; sourceTree = "<group>"; };
    13277                 CDA98DCF1601597900FEA3B1 /* JSMediaKeys.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSMediaKeys.h; sourceTree = "<group>"; };
    13278                 CDA98DD01601597900FEA3B1 /* JSMediaKeySession.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSMediaKeySession.cpp; sourceTree = "<group>"; };
    13279                 CDA98DD11601597900FEA3B1 /* JSMediaKeySession.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSMediaKeySession.h; sourceTree = "<group>"; };
    13280                 CDA98DD516025BED00FEA3B1 /* MediaKeyMessageEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaKeyMessageEvent.cpp; sourceTree = "<group>"; };
    13281                 CDA98DD616025BED00FEA3B1 /* MediaKeyMessageEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaKeyMessageEvent.h; sourceTree = "<group>"; };
    13282                 CDA98DD716025BEE00FEA3B1 /* MediaKeyMessageEvent.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = MediaKeyMessageEvent.idl; sourceTree = "<group>"; };
    13283                 CDA98DDB16026A1800FEA3B1 /* JSMediaKeyMessageEvent.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = JSMediaKeyMessageEvent.cpp; sourceTree = "<group>"; };
    13284                 CDA98DDC16026A1900FEA3B1 /* JSMediaKeyMessageEvent.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JSMediaKeyMessageEvent.h; sourceTree = "<group>"; };
    13285                 CDA98DDD16026A1900FEA3B1 /* JSMediaKeyNeededEvent.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = JSMediaKeyNeededEvent.cpp; sourceTree = "<group>"; };
    13286                 CDA98DDE16026A1900FEA3B1 /* JSMediaKeyNeededEvent.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JSMediaKeyNeededEvent.h; sourceTree = "<group>"; };
     13283                CDA98D9B160128A500FEA3B1 /* JSWebKitMediaKeyError.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWebKitMediaKeyError.cpp; sourceTree = "<group>"; };
     13284                CDA98D9C160128A500FEA3B1 /* JSWebKitMediaKeyError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSWebKitMediaKeyError.h; sourceTree = "<group>"; };
     13285                CDA98DCE1601597900FEA3B1 /* JSWebKitMediaKeys.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWebKitMediaKeys.cpp; sourceTree = "<group>"; };
     13286                CDA98DCF1601597900FEA3B1 /* JSWebKitMediaKeys.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSWebKitMediaKeys.h; sourceTree = "<group>"; };
     13287                CDA98DD01601597900FEA3B1 /* JSWebKitMediaKeySession.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWebKitMediaKeySession.cpp; sourceTree = "<group>"; };
     13288                CDA98DD11601597900FEA3B1 /* JSWebKitMediaKeySession.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSWebKitMediaKeySession.h; sourceTree = "<group>"; };
     13289                CDA98DDB16026A1800FEA3B1 /* JSWebKitMediaKeyMessageEvent.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = JSWebKitMediaKeyMessageEvent.cpp; sourceTree = "<group>"; };
     13290                CDA98DDC16026A1900FEA3B1 /* JSWebKitMediaKeyMessageEvent.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JSWebKitMediaKeyMessageEvent.h; sourceTree = "<group>"; };
     13291                CDA98DDD16026A1900FEA3B1 /* JSWebKitMediaKeyNeededEvent.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = JSWebKitMediaKeyNeededEvent.cpp; sourceTree = "<group>"; };
     13292                CDA98DDE16026A1900FEA3B1 /* JSWebKitMediaKeyNeededEvent.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JSWebKitMediaKeyNeededEvent.h; sourceTree = "<group>"; };
    1328713293                CDA98E091603CD5900FEA3B1 /* CDM.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CDM.cpp; sourceTree = "<group>"; };
    1328813294                CDA98E0A1603CD5900FEA3B1 /* CDM.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CDM.h; sourceTree = "<group>"; };
    … …  
    1330013306                CDAE8C071746B95700532D78 /* PlatformMediaSessionManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PlatformMediaSessionManager.cpp; sourceTree = "<group>"; };
    1330113307                CDAE8C081746B95700532D78 /* PlatformMediaSessionManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlatformMediaSessionManager.h; sourceTree = "<group>"; };
    13302                 CDB859F2160D489900E5B07F /* MediaKeyError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaKeyError.h; sourceTree = "<group>"; };
    13303                 CDB859F3160D489900E5B07F /* MediaKeyError.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = MediaKeyError.idl; sourceTree = "<group>"; };
    1330413308                CDBEAEAA19D92B6C00BEBA88 /* MediaSelectionGroupAVFObjC.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MediaSelectionGroupAVFObjC.mm; sourceTree = "<group>"; };
    1330513309                CDBEAEAB19D92B6C00BEBA88 /* MediaSelectionGroupAVFObjC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaSelectionGroupAVFObjC.h; sourceTree = "<group>"; };
    … …  
    1580015804                        sourceTree = "<group>";
    1580115805                };
     15806                2D0621461DA639EC00A7FB26 /* legacy */ = {
     15807                        isa = PBXGroup;
     15808                        children = (
     15809                                2D0621421DA6398800A7FB26 /* WebKitMediaKeyMessageEvent.cpp */,
     15810                                2D0621431DA6398800A7FB26 /* WebKitMediaKeyMessageEvent.h */,
     15811                                2D0621531DA63ABF00A7FB26 /* WebKitMediaKeyMessageEvent.idl */,
     15812                                2D0621471DA63A7900A7FB26 /* WebKitMediaKeyNeededEvent.cpp */,
     15813                                2D0621481DA63A7900A7FB26 /* WebKitMediaKeyNeededEvent.h */,
     15814                                2D0621541DA63ABF00A7FB26 /* WebKitMediaKeyNeededEvent.idl */,
     15815                                2D06214B1DA63A7900A7FB26 /* WebKitMediaKeySession.cpp */,
     15816                                2D06214C1DA63A7900A7FB26 /* WebKitMediaKeySession.h */,
     15817                                2D0621561DA63ABF00A7FB26 /* WebKitMediaKeySession.idl */,
     15818                                2D0621491DA63A7900A7FB26 /* WebKitMediaKeys.cpp */,
     15819                                2D06214A1DA63A7900A7FB26 /* WebKitMediaKeys.h */,
     15820                                2D0621551DA63ABF00A7FB26 /* WebKitMediaKeys.idl */,
     15821                        );
     15822                        path = legacy;
     15823                        sourceTree = "<group>";
     15824                };
    1580215825                2D5036661BCDDDC400E20BB3 /* mac */ = {
    1580315826                        isa = PBXGroup;
    … …  
    1817218195                                07A6D1E91491137700051D0C /* MediaFragmentURIParser.cpp */,
    1817318196                                07A6D1EA1491137700051D0C /* MediaFragmentURIParser.h */,
    18174                                 CDB859F2160D489900E5B07F /* MediaKeyError.h */,
    18175                                 CDB859F3160D489900E5B07F /* MediaKeyError.idl */,
    1817618197                                F55B3D911251F12D003EF269 /* MonthInputType.cpp */,
    1817718198                                F55B3D921251F12D003EF269 /* MonthInputType.h */,
    … …  
    1823018251                                E44613A00CD6331000FADA75 /* VoidCallback.idl */,
    1823118252                                A5A7AA42132F0ECC00D3A3C2 /* WebAutocapitalize.h */,
     18253                                2D1932171DA64E1900A54A08 /* WebKitMediaKeyError.h */,
     18254                                2D1932181DA64E1900A54A08 /* WebKitMediaKeyError.idl */,
    1823218255                                F55B3DAB1251F12D003EF269 /* WeekInputType.cpp */,
    1823318256                                F55B3DAC1251F12D003EF269 /* WeekInputType.h */,
    … …  
    2188921912                        isa = PBXGroup;
    2189021913                        children = (
     21914                                2D0621461DA639EC00A7FB26 /* legacy */,
    2189121915                                CDA98E091603CD5900FEA3B1 /* CDM.cpp */,
    2189221916                                CDA98E0A1603CD5900FEA3B1 /* CDM.h */,
    … …  
    2189821922                                CDE8B5EE1A69778B00B4B66A /* CDMSessionClearKey.cpp */,
    2189921923                                CDE8B5EF1A69778B00B4B66A /* CDMSessionClearKey.h */,
    21900                                 CDA98DD516025BED00FEA3B1 /* MediaKeyMessageEvent.cpp */,
    21901                                 CDA98DD616025BED00FEA3B1 /* MediaKeyMessageEvent.h */,
    21902                                 CDA98DD716025BEE00FEA3B1 /* MediaKeyMessageEvent.idl */,
    21903                                 CDA98DC216014EEE00FEA3B1 /* MediaKeyNeededEvent.cpp */,
    21904                                 CDA98DC316014EEE00FEA3B1 /* MediaKeyNeededEvent.h */,
    21905                                 CDA98DC416014EEE00FEA3B1 /* MediaKeyNeededEvent.idl */,
    21906                                 CDA98DCA1601508A00FEA3B1 /* MediaKeys.cpp */,
    21907                                 CDA98DCB1601508A00FEA3B1 /* MediaKeys.h */,
    21908                                 CDA98DCC1601508A00FEA3B1 /* MediaKeys.idl */,
    21909                                 CDA98DC716014F2C00FEA3B1 /* MediaKeySession.cpp */,
    21910                                 CDA98DC816014F2C00FEA3B1 /* MediaKeySession.h */,
    21911                                 CDA98DC916014F4000FEA3B1 /* MediaKeySession.idl */,
    2191221924                        );
    2191321925                        path = encryptedmedia;
    … …  
    2191721929                        isa = PBXGroup;
    2191821930                        children = (
    21919                                 CDA98D9B160128A500FEA3B1 /* JSMediaKeyError.cpp */,
    21920                                 CDA98D9C160128A500FEA3B1 /* JSMediaKeyError.h */,
    21921                                 CDA98DDB16026A1800FEA3B1 /* JSMediaKeyMessageEvent.cpp */,
    21922                                 CDA98DDC16026A1900FEA3B1 /* JSMediaKeyMessageEvent.h */,
    21923                                 CDA98DDD16026A1900FEA3B1 /* JSMediaKeyNeededEvent.cpp */,
    21924                                 CDA98DDE16026A1900FEA3B1 /* JSMediaKeyNeededEvent.h */,
    21925                                 CDA98DCE1601597900FEA3B1 /* JSMediaKeys.cpp */,
    21926                                 CDA98DCF1601597900FEA3B1 /* JSMediaKeys.h */,
    21927                                 CDA98DD01601597900FEA3B1 /* JSMediaKeySession.cpp */,
    21928                                 CDA98DD11601597900FEA3B1 /* JSMediaKeySession.h */,
     21931                                CDA98D9B160128A500FEA3B1 /* JSWebKitMediaKeyError.cpp */,
     21932                                CDA98D9C160128A500FEA3B1 /* JSWebKitMediaKeyError.h */,
     21933                                CDA98DDB16026A1800FEA3B1 /* JSWebKitMediaKeyMessageEvent.cpp */,
     21934                                CDA98DDC16026A1900FEA3B1 /* JSWebKitMediaKeyMessageEvent.h */,
     21935                                CDA98DDD16026A1900FEA3B1 /* JSWebKitMediaKeyNeededEvent.cpp */,
     21936                                CDA98DDE16026A1900FEA3B1 /* JSWebKitMediaKeyNeededEvent.h */,
     21937                                CDA98DCE1601597900FEA3B1 /* JSWebKitMediaKeys.cpp */,
     21938                                CDA98DCF1601597900FEA3B1 /* JSWebKitMediaKeys.h */,
     21939                                CDA98DD01601597900FEA3B1 /* JSWebKitMediaKeySession.cpp */,
     21940                                CDA98DD11601597900FEA3B1 /* JSWebKitMediaKeySession.h */,
    2192921941                        );
    2193021942                        name = EncryptedMedia;
    … …  
    2410124113                                F55B3DB41251F12D003EF269 /* ColorInputType.h in Headers */,
    2410224114                                EDE3A5000C7A430600956A37 /* ColorMac.h in Headers */,
     24115                                2D0621511DA63A9F00A7FB26 /* WebKitMediaKeyNeededEvent.h in Headers */,
    2410324116                                9382DF5810A8D5C900925652 /* ColorSpace.h in Headers */,
    2410424117                                BCDD454E1236C95C009A7985 /* ColumnInfo.h in Headers */,
    … …  
    2421124224                                E125F8361822F18A00D84CD9 /* CryptoKeyHMAC.h in Headers */,
    2421224225                                E1F80B8818317252007885C3 /* CryptoKeyPair.h in Headers */,
     24226                                2D0621451DA639BA00A7FB26 /* WebKitMediaKeyMessageEvent.h in Headers */,
    2421324227                                E164FAA318315BF400DB4E61 /* CryptoKeyRSA.h in Headers */,
    2421424228                                E125F856182C0F8300D84CD9 /* CryptoKeySerialization.h in Headers */,
    … …  
    2553925553                                7C73FB12191EF6F4007DE061 /* JSUserMessageHandler.h in Headers */,
    2554025554                                7C73FB0D191EF5A8007DE061 /* JSUserMessageHandlersNamespace.h in Headers */,
     25555                                2D06214E1DA63A8E00A7FB26 /* WebKitMediaKeys.h in Headers */,
    2554125556                                15C77093100D3CA8005BA267 /* JSValidityState.h in Headers */,
    2554225557                                BE8EF04B171C9014009B48C3 /* JSVideoTrack.h in Headers */,
    … …  
    2598826003                                A8FA6E5D0E4CFDED00D5CF49 /* Pattern.h in Headers */,
    2598926004                                B22279710D00BF220071B782 /* PatternAttributes.h in Headers */,
     26005                                2D0621501DA63A9400A7FB26 /* WebKitMediaKeySession.h in Headers */,
    2599026006                                1A8A643A1D19FC5300D0E00F /* Payment.h in Headers */,
    2599126007                                1AE96A881D1A0CEB00B86768 /* PaymentAuthorizationStatus.h in Headers */,
    … …  
    2795927975                                FBB0C5B717BBD626003D3677 /* CSSFilterImageValue.cpp in Sources */,
    2796027976                                BC64B4D50CB4298A005F2B62 /* CSSFontFace.cpp in Sources */,
     27977                                2D0621441DA639B600A7FB26 /* WebKitMediaKeyMessageEvent.cpp in Sources */,
    2796127978                                409EBDB216B7EE7400CBA3FC /* CSSFontFaceLoadEvent.cpp in Sources */,
    2796227979                                07B7116E1D899E63009F0FFB /* CaptureDeviceManager.cpp in Sources */,
    … …  
    2896428981                                FD23A12513F5FA5900F67001 /* JSMediaElementAudioSourceNode.cpp in Sources */,
    2896528982                                E44614180CD6826900FADA75 /* JSMediaError.cpp in Sources */,
    28966                                 CDA98DA31601464100FEA3B1 /* JSMediaKeyError.cpp in Sources */,
    28967                                 CDA98DDF16026A3700FEA3B1 /* JSMediaKeyMessageEvent.cpp in Sources */,
    28968                                 CDA98DE016026A3700FEA3B1 /* JSMediaKeyNeededEvent.cpp in Sources */,
    28969                                 CDA98E0416039E1A00FEA3B1 /* JSMediaKeys.cpp in Sources */,
    28970                                 CDA98E0616039E1F00FEA3B1 /* JSMediaKeySession.cpp in Sources */,
     28983                                CDA98DA31601464100FEA3B1 /* JSWebKitMediaKeyError.cpp in Sources */,
     28984                                CDA98DDF16026A3700FEA3B1 /* JSWebKitMediaKeyMessageEvent.cpp in Sources */,
     28985                                CDA98DE016026A3700FEA3B1 /* JSWebKitMediaKeyNeededEvent.cpp in Sources */,
     28986                                CDA98E0416039E1A00FEA3B1 /* JSWebKitMediaKeys.cpp in Sources */,
     28987                                CDA98E0616039E1F00FEA3B1 /* JSWebKitMediaKeySession.cpp in Sources */,
    2897128988                                BC3C39B60C0D3D8D005F4D7A /* JSMediaList.cpp in Sources */,
    2897228989                                D3A94A46122DC40F00A37BBC /* JSMediaQueryList.cpp in Sources */,
    … …  
    2929729314                                6E3FAD3814733F4000E42306 /* JSWebGLCompressedTextureS3TC.cpp in Sources */,
    2929829315                                6EE8A77210F803F3005A4A24 /* JSWebGLContextAttributes.cpp in Sources */,
     29316                                2D06214D1DA63A8B00A7FB26 /* WebKitMediaKeys.cpp in Sources */,
    2929929317                                BC2CBF7B140F1D58003879BE /* JSWebGLContextEvent.cpp in Sources */,
    2930029318                                6E3FAD3814733F4010E42307 /* JSWebGLDebugRendererInfo.cpp in Sources */,
    … …  
    2946729485                                4E1959210A39DABA00220FE5 /* MediaFeatureNames.cpp in Sources */,
    2946829486                                07A6D1EB1491137700051D0C /* MediaFragmentURIParser.cpp in Sources */,
    29469                                 CDA98DD816025BEF00FEA3B1 /* MediaKeyMessageEvent.cpp in Sources */,
    29470                                 CD1B4A65160786AE00282DF9 /* MediaKeyNeededEvent.cpp in Sources */,
    29471                                 CDA98E0D1603FE4A00FEA3B1 /* MediaKeys.cpp in Sources */,
    29472                                 CDA98E0E1603FE5800FEA3B1 /* MediaKeySession.cpp in Sources */,
    2947329487                                A8EA80090A19516E00A8EF5F /* MediaList.cpp in Sources */,
    2947429488                                071E496E1AD5AA0D008A50B4 /* MediaPlaybackTargetMac.mm in Sources */,
    … …  
    2981629830                                439046E312DA25E800AF80A2 /* RenderMathMLRow.cpp in Sources */,
    2981729831                                439046E712DA25E800AF80A2 /* RenderMathMLScripts.cpp in Sources */,
     29832                                2D0621521DA63AA200A7FB26 /* WebKitMediaKeyNeededEvent.cpp in Sources */,
    2981829833                                5B7A208D2E12979B4AE19DE6 /* RenderMathMLSpace.cpp in Sources */,
    2981929834                                439046EB12DA25E800AF80A9 /* RenderMathMLToken.cpp in Sources */,
    … …  
    3047430489                                7C3F01C21C8E5AC200ADD962 /* UserContentProvider.cpp in Sources */,
    3047530490                                BCACF3BC1072921A00C0C8A3 /* UserContentURLPattern.cpp in Sources */,
     30491                                2D06214F1DA63A9100A7FB26 /* WebKitMediaKeySession.cpp in Sources */,
    3047630492                                2542F4DA1166C25A00E89A86 /* UserGestureIndicator.cpp in Sources */,
    3047730493                                9920398218B95BC600B39AF9 /* UserInputBridge.cpp in Sources */,

  • trunk/Source/WebCore/bindings/js/JSDictionary.cpp

    r206811 r206983  
    4646
    4747#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
    48 #include "JSMediaKeyError.h"
     48#include "JSWebKitMediaKeyError.h"
    4949#endif
    5050
    … …  
    258258
    259259#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
    260 void JSDictionary::convertValue(JSC::ExecState*, JSC::JSValue value, RefPtr<MediaKeyError>& result)
    261 {
    262     result = JSMediaKeyError::toWrapped(value);
     260void JSDictionary::convertValue(JSC::ExecState*, JSC::JSValue value, RefPtr<WebKitMediaKeyError>& result)
     261{
     262    result = JSWebKitMediaKeyError::toWrapped(value);
    263263}
    264264#endif

  • trunk/Source/WebCore/bindings/js/JSDictionary.h

    r206811 r206983  
    5050class Gamepad;
    5151class FetchHeaders;
    52 class MediaKeyError;
    5352class MediaStream;
    5453class MediaStreamTrack;
    … …  
    6261class TrackBase;
    6362class VoidCallback;
     63class WebKitMediaKeyError;
    6464
    6565class JSDictionary {
    … …  
    145145    static void convertValue(JSC::ExecState*, JSC::JSValue, RefPtr<JSC::Uint8Array>& result);
    146146#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
    147     static void convertValue(JSC::ExecState*, JSC::JSValue, RefPtr<MediaKeyError>& result);
     147    static void convertValue(JSC::ExecState*, JSC::JSValue, RefPtr<WebKitMediaKeyError>& result);
    148148#endif
    149149#if ENABLE(FETCH_API)

  • trunk/Source/WebCore/dom/EventNames.in

    r206963 r206983  
    6060DeviceProximityEvent conditional=PROXIMITY_EVENTS
    6161OrientationEvent interfaceName=Event, conditional=ORIENTATION_EVENTS
    62 MediaKeyMessageEvent conditional=LEGACY_ENCRYPTED_MEDIA
    63 MediaKeyNeededEvent conditional=LEGACY_ENCRYPTED_MEDIA
     62WebKitMediaKeyMessageEvent conditional=LEGACY_ENCRYPTED_MEDIA
     63WebKitMediaKeyNeededEvent conditional=LEGACY_ENCRYPTED_MEDIA
    6464TrackEvent conditional=VIDEO_TRACK
    6565AutocompleteErrorEvent conditional=REQUEST_AUTOCOMPLETE

  • trunk/Source/WebCore/dom/EventTargetFactory.in

    r206811 r206983  
    1616IDBRequest conditional=INDEXED_DATABASE
    1717IDBTransaction conditional=INDEXED_DATABASE
    18 MediaKeySession conditional=LEGACY_ENCRYPTED_MEDIA
    1918MediaController conditional=VIDEO
    2019MediaRemoteControls conditional=MEDIA_SESSION
    … …  
    3635TextTrackList conditional=VIDEO_TRACK
    3736VideoTrackList conditional=VIDEO_TRACK
     37WebKitMediaKeySession conditional=LEGACY_ENCRYPTED_MEDIA
    3838WebKitNamedFlow
    3939WebSocket conditional=WEB_SOCKETS

  • trunk/Source/WebCore/html/HTMLMediaElement.cpp

    r206982 r206983  
    146146
    147147#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
    148 #include "MediaKeyNeededEvent.h"
    149 #include "MediaKeys.h"
     148#include "WebKitMediaKeyNeededEvent.h"
     149#include "WebKitMediaKeys.h"
    150150#endif
    151151
    … …  
    584584
    585585#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
    586     setMediaKeys(0);
     586    webkitSetMediaKeys(0);
    587587#endif
    588588
    … …  
    24472447    }
    24482448
    2449     auto event = MediaKeyNeededEvent::create(eventNames().webkitneedkeyEvent, initData);
     2449    auto event = WebKitMediaKeyNeededEvent::create(eventNames().webkitneedkeyEvent, initData);
    24502450    event->setTarget(this);
    24512451    m_asyncEventQueue.enqueueEvent(WTFMove(event));
    … …  
    24712471}
    24722472
    2473 void HTMLMediaElement::setMediaKeys(MediaKeys* mediaKeys)
     2473void HTMLMediaElement::webkitSetMediaKeys(WebKitMediaKeys* mediaKeys)
    24742474{
    24752475    if (m_mediaKeys == mediaKeys)

  • trunk/Source/WebCore/html/HTMLMediaElement.h

    r206811 r206983  
    7171class MediaElementAudioSourceNode;
    7272class MediaError;
    73 class MediaKeys;
    7473class MediaPlayer;
    7574class MediaSession;
    … …  
    8584class VideoTrackList;
    8685class VideoTrackPrivate;
     86#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
     87class WebKitMediaKeys;
     88#endif
    8789
    8890#if ENABLE(VIDEO_TRACK)
    … …  
    250252
    251253#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
    252     MediaKeys* keys() const { return m_mediaKeys.get(); }
    253     void setMediaKeys(MediaKeys*);
     254    WebKitMediaKeys* webkitKeys() const { return m_mediaKeys.get(); }
     255    void webkitSetMediaKeys(WebKitMediaKeys*);
    254256
    255257    void keyAdded();
    … …  
    10001002
    10011003#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
    1002     RefPtr<MediaKeys> m_mediaKeys;
     1004    RefPtr<WebKitMediaKeys> m_mediaKeys;
    10031005#endif
    10041006

  • trunk/Source/WebCore/html/HTMLMediaElement.idl

    r206811 r206983  
    9292    [Conditional=MEDIA_STATISTICS] readonly attribute unsigned long webkitVideoDecodedByteCount;
    9393
    94     [Conditional=LEGACY_ENCRYPTED_MEDIA, ImplementedAs=keys] readonly attribute MediaKeys webkitKeys;
    95     [Conditional=LEGACY_ENCRYPTED_MEDIA, ImplementedAs=setMediaKeys] void webkitSetMediaKeys(MediaKeys? mediaKeys);
     94    [Conditional=LEGACY_ENCRYPTED_MEDIA] readonly attribute WebKitMediaKeys webkitKeys;
     95    [Conditional=LEGACY_ENCRYPTED_MEDIA] void webkitSetMediaKeys(WebKitMediaKeys? mediaKeys);
    9696
    9797    [Conditional=VIDEO_TRACK, MayThrowLegacyException] TextTrack addTextTrack(DOMString kind, optional DOMString label = "", optional DOMString language = "");

  • trunk/Source/WebCore/html/WebKitMediaKeyError.h

    r206982 r206983  
    2424 */
    2525
    26 #ifndef MediaKeyError_h
    27 #define MediaKeyError_h
     26#ifndef WebKitMediaKeyError_h
     27#define WebKitMediaKeyError_h
    2828
    2929#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
    … …  
    3434namespace WebCore {
    3535
    36 class MediaKeyError : public RefCounted<MediaKeyError> {
     36class WebKitMediaKeyError : public RefCounted<WebKitMediaKeyError> {
    3737public:
    3838    enum {
    … …  
    4646    typedef unsigned short Code;
    4747
    48     static Ref<MediaKeyError> create(Code code, uint32_t systemCode = 0) { return adoptRef(*new MediaKeyError(code, systemCode)); }
     48    static Ref<WebKitMediaKeyError> create(Code code, uint32_t systemCode = 0) { return adoptRef(*new WebKitMediaKeyError(code, systemCode)); }
    4949
    5050    Code code() const { return m_code; }
    … …  
    5252
    5353private:
    54     explicit MediaKeyError(Code code, unsigned long systemCode) : m_code(code), m_systemCode(systemCode) { }
     54    explicit WebKitMediaKeyError(Code code, unsigned long systemCode) : m_code(code), m_systemCode(systemCode) { }
    5555
    5656    Code m_code;

  • trunk/Source/WebCore/html/WebKitMediaKeyError.idl

    r206982 r206983  
    2727    Conditional=LEGACY_ENCRYPTED_MEDIA,
    2828    ImplementationLacksVTable,
    29     InterfaceName=WebKitMediaKeyError
    30 ] interface MediaKeyError {
     29] interface WebKitMediaKeyError {
    3130    const unsigned short MEDIA_KEYERR_UNKNOWN = 1;
    3231    const unsigned short MEDIA_KEYERR_CLIENT = 2;
    … …  
    3635    const unsigned short MEDIA_KEYERR_DOMAIN = 6;
    3736    readonly attribute unsigned short code;
    38     [Conditional=LEGACY_ENCRYPTED_MEDIA] readonly attribute unsigned long systemCode;
     37    readonly attribute unsigned long systemCode;
    3938};

  • trunk/Source/WebCore/testing/MockCDM.cpp

    r206811 r206983  
    3131#include "CDM.h"
    3232#include "CDMSession.h"
    33 #include "MediaKeyError.h"
     33#include "WebKitMediaKeyError.h"
    3434#include <runtime/JSCInlines.h>
    3535#include <runtime/TypedArrayInlines.h>
    … …  
    117117    for (unsigned i = 0; i < initDataPrefix()->length(); ++i) {
    118118        if (!initData || i >= initData->length() || initData->item(i) != initDataPrefix()->item(i)) {
    119             errorCode = MediaKeyError::MEDIA_KEYERR_UNKNOWN;
     119            errorCode = WebKitMediaKeyError::MEDIA_KEYERR_UNKNOWN;
    120120            return nullptr;
    121121        }
    … …  
    133133    for (unsigned i = 0; i < keyPrefix()->length(); ++i) {
    134134        if (i >= key->length() || key->item(i) != keyPrefix()->item(i)) {
    135             errorCode = MediaKeyError::MEDIA_KEYERR_CLIENT;
     135            errorCode = WebKitMediaKeyError::MEDIA_KEYERR_CLIENT;
    136136            return false;
    137137        }
Note: See TracChangeset for help on using the changeset viewer.