Changeset 209936 in webkit


Ignore:
Timestamp:
Dec 16, 2016 1:52:38 PM (7 years ago)
Author:
jer.noble@apple.com
Message:

Move existing CDM* implementations into modules/encryptedmedia/legacy
​https://bugs.webkit.org/show_bug.cgi?id=165823

Rubber-stamped by Sam Weinig.

  • Modules/encryptedmedia/legacy/LegacyCDM.cpp: Renamed from Source/WebCore/Modules/encryptedmedia/CDM.cpp.

(WebCore::CDMFactory::CDMFactory):
(WebCore::installedCDMFactories):
(WebCore::CDM::registerCDMFactory):
(WebCore::CDMFactoryForKeySystem):
(WebCore::CDM::supportsKeySystem):
(WebCore::CDM::keySystemSupportsMimeType):
(WebCore::CDM::create):
(WebCore::CDM::CDM):
(WebCore::CDM::~CDM):
(WebCore::CDM::supportsMIMEType):
(WebCore::CDM::createSession):
(WebCore::CDM::mediaPlayer):

  • Modules/encryptedmedia/legacy/LegacyCDM.h: Renamed from Source/WebCore/Modules/encryptedmedia/CDM.h.

(WebCore::CDMClient::~CDMClient):
(WebCore::CDM::keySystem):
(WebCore::CDM::client):
(WebCore::CDM::setClient):

  • Modules/encryptedmedia/legacy/LegacyCDMPrivate.h: Renamed from Source/WebCore/Modules/encryptedmedia/CDMPrivate.h.

(WebCore::CDMPrivateInterface::CDMPrivateInterface):
(WebCore::CDMPrivateInterface::~CDMPrivateInterface):

  • Modules/encryptedmedia/legacy/LegacyCDMPrivateClearKey.cpp: Renamed from Source/WebCore/Modules/encryptedmedia/CDMPrivateClearKey.cpp.

(WebCore::CDMPrivateClearKey::supportsKeySystem):
(WebCore::CDMPrivateClearKey::supportsKeySystemAndMimeType):
(WebCore::CDMPrivateClearKey::supportsMIMEType):
(WebCore::CDMPrivateClearKey::createSession):

  • Modules/encryptedmedia/legacy/LegacyCDMPrivateClearKey.h: Renamed from Source/WebCore/Modules/encryptedmedia/CDMPrivateClearKey.h.

(WebCore::CDMPrivateClearKey::CDMPrivateClearKey):
(WebCore::CDMPrivateClearKey::~CDMPrivateClearKey):

  • Modules/encryptedmedia/legacy/LegacyCDMPrivateMediaPlayer.cpp: Renamed from Source/WebCore/Modules/encryptedmedia/CDMPrivateMediaPlayer.cpp.

(WebCore::CDMPrivateMediaPlayer::supportsKeySystem):
(WebCore::CDMPrivateMediaPlayer::supportsKeySystemAndMimeType):
(WebCore::CDMPrivateMediaPlayer::supportsMIMEType):
(WebCore::CDMPrivateMediaPlayer::createSession):

  • Modules/encryptedmedia/legacy/LegacyCDMPrivateMediaPlayer.h: Renamed from Source/WebCore/Modules/encryptedmedia/CDMPrivateMediaPlayer.h.

(WebCore::CDMPrivateMediaPlayer::CDMPrivateMediaPlayer):
(WebCore::CDMPrivateMediaPlayer::~CDMPrivateMediaPlayer):
(WebCore::CDMPrivateMediaPlayer::cdm):

  • Modules/encryptedmedia/legacy/LegacyCDMSessionClearKey.cpp: Renamed from Source/WebCore/Modules/encryptedmedia/CDMSessionClearKey.cpp.

(WebCore::clearKeyVM):
(WebCore::CDMSessionClearKey::CDMSessionClearKey):
(WebCore::CDMSessionClearKey::~CDMSessionClearKey):
(WebCore::CDMSessionClearKey::generateKeyRequest):
(WebCore::CDMSessionClearKey::releaseKeys):
(WebCore::CDMSessionClearKey::update):
(WebCore::CDMSessionClearKey::cachedKeyForKeyID):

  • Modules/encryptedmedia/legacy/LegacyCDMSessionClearKey.h: Renamed from Source/WebCore/Modules/encryptedmedia/CDMSessionClearKey.h.
  • Modules/encryptedmedia/legacy/WebKitMediaKeySession.h:
  • Modules/encryptedmedia/legacy/WebKitMediaKeys.h:
  • WebCore.xcodeproj/project.pbxproj:
  • platform/graphics/LegacyCDMSession.h: Renamed from Source/WebCore/platform/graphics/CDMSession.h.

(WebCore::CDMSessionClient::~CDMSessionClient):
(WebCore::CDMSession::CDMSession):
(WebCore::CDMSession::~CDMSession):
(WebCore::CDMSession::type):
(WebCore::CDMSession::cachedKeyForKeyID):

  • platform/graphics/MediaPlayer.h:
  • platform/graphics/avfoundation/CDMPrivateMediaSourceAVFObjC.h:
  • platform/graphics/avfoundation/CDMPrivateMediaSourceAVFObjC.mm:
  • platform/graphics/avfoundation/objc/CDMSessionAVContentKeySession.mm:
  • platform/graphics/avfoundation/objc/CDMSessionAVFoundationObjC.h:
  • platform/graphics/avfoundation/objc/CDMSessionAVFoundationObjC.mm:
  • platform/graphics/avfoundation/objc/CDMSessionAVStreamSession.mm:
  • platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.h:
  • testing/Internals.cpp:
  • testing/LegacyMockCDM.cpp: Renamed from Source/WebCore/testing/MockCDM.cpp.

(WebCore::MockCDMSession::~MockCDMSession):
(WebCore::MockCDM::supportsKeySystem):
(WebCore::MockCDM::supportsKeySystemAndMimeType):
(WebCore::MockCDM::supportsMIMEType):
(WebCore::MockCDM::createSession):
(WebCore::initDataPrefix):
(WebCore::keyPrefix):
(WebCore::keyRequest):
(WebCore::generateSessionId):
(WebCore::MockCDMSession::MockCDMSession):
(WebCore::MockCDMSession::generateKeyRequest):
(WebCore::MockCDMSession::releaseKeys):
(WebCore::MockCDMSession::update):

  • testing/LegacyMockCDM.h: Renamed from Source/WebCore/testing/MockCDM.h.

(WebCore::MockCDM::MockCDM):
(WebCore::MockCDM::~MockCDM):

Location:
trunk/Source/WebCore
Files:
16 edited
12 moved

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r209932 r209936  
     12016-12-13  Jer Noble  <jer.noble@apple.com>
     2
     3        Move existing CDM* implementations into modules/encryptedmedia/legacy
     4        https://bugs.webkit.org/show_bug.cgi?id=165823
     5
     6        Rubber-stamped by Sam Weinig.
     7
     8        * Modules/encryptedmedia/legacy/LegacyCDM.cpp: Renamed from Source/WebCore/Modules/encryptedmedia/CDM.cpp.
     9        (WebCore::CDMFactory::CDMFactory):
     10        (WebCore::installedCDMFactories):
     11        (WebCore::CDM::registerCDMFactory):
     12        (WebCore::CDMFactoryForKeySystem):
     13        (WebCore::CDM::supportsKeySystem):
     14        (WebCore::CDM::keySystemSupportsMimeType):
     15        (WebCore::CDM::create):
     16        (WebCore::CDM::CDM):
     17        (WebCore::CDM::~CDM):
     18        (WebCore::CDM::supportsMIMEType):
     19        (WebCore::CDM::createSession):
     20        (WebCore::CDM::mediaPlayer):
     21        * Modules/encryptedmedia/legacy/LegacyCDM.h: Renamed from Source/WebCore/Modules/encryptedmedia/CDM.h.
     22        (WebCore::CDMClient::~CDMClient):
     23        (WebCore::CDM::keySystem):
     24        (WebCore::CDM::client):
     25        (WebCore::CDM::setClient):
     26        * Modules/encryptedmedia/legacy/LegacyCDMPrivate.h: Renamed from Source/WebCore/Modules/encryptedmedia/CDMPrivate.h.
     27        (WebCore::CDMPrivateInterface::CDMPrivateInterface):
     28        (WebCore::CDMPrivateInterface::~CDMPrivateInterface):
     29        * Modules/encryptedmedia/legacy/LegacyCDMPrivateClearKey.cpp: Renamed from Source/WebCore/Modules/encryptedmedia/CDMPrivateClearKey.cpp.
     30        (WebCore::CDMPrivateClearKey::supportsKeySystem):
     31        (WebCore::CDMPrivateClearKey::supportsKeySystemAndMimeType):
     32        (WebCore::CDMPrivateClearKey::supportsMIMEType):
     33        (WebCore::CDMPrivateClearKey::createSession):
     34        * Modules/encryptedmedia/legacy/LegacyCDMPrivateClearKey.h: Renamed from Source/WebCore/Modules/encryptedmedia/CDMPrivateClearKey.h.
     35        (WebCore::CDMPrivateClearKey::CDMPrivateClearKey):
     36        (WebCore::CDMPrivateClearKey::~CDMPrivateClearKey):
     37        * Modules/encryptedmedia/legacy/LegacyCDMPrivateMediaPlayer.cpp: Renamed from Source/WebCore/Modules/encryptedmedia/CDMPrivateMediaPlayer.cpp.
     38        (WebCore::CDMPrivateMediaPlayer::supportsKeySystem):
     39        (WebCore::CDMPrivateMediaPlayer::supportsKeySystemAndMimeType):
     40        (WebCore::CDMPrivateMediaPlayer::supportsMIMEType):
     41        (WebCore::CDMPrivateMediaPlayer::createSession):
     42        * Modules/encryptedmedia/legacy/LegacyCDMPrivateMediaPlayer.h: Renamed from Source/WebCore/Modules/encryptedmedia/CDMPrivateMediaPlayer.h.
     43        (WebCore::CDMPrivateMediaPlayer::CDMPrivateMediaPlayer):
     44        (WebCore::CDMPrivateMediaPlayer::~CDMPrivateMediaPlayer):
     45        (WebCore::CDMPrivateMediaPlayer::cdm):
     46        * Modules/encryptedmedia/legacy/LegacyCDMSessionClearKey.cpp: Renamed from Source/WebCore/Modules/encryptedmedia/CDMSessionClearKey.cpp.
     47        (WebCore::clearKeyVM):
     48        (WebCore::CDMSessionClearKey::CDMSessionClearKey):
     49        (WebCore::CDMSessionClearKey::~CDMSessionClearKey):
     50        (WebCore::CDMSessionClearKey::generateKeyRequest):
     51        (WebCore::CDMSessionClearKey::releaseKeys):
     52        (WebCore::CDMSessionClearKey::update):
     53        (WebCore::CDMSessionClearKey::cachedKeyForKeyID):
     54        * Modules/encryptedmedia/legacy/LegacyCDMSessionClearKey.h: Renamed from Source/WebCore/Modules/encryptedmedia/CDMSessionClearKey.h.
     55        * Modules/encryptedmedia/legacy/WebKitMediaKeySession.h:
     56        * Modules/encryptedmedia/legacy/WebKitMediaKeys.h:
     57        * WebCore.xcodeproj/project.pbxproj:
     58        * platform/graphics/LegacyCDMSession.h: Renamed from Source/WebCore/platform/graphics/CDMSession.h.
     59        (WebCore::CDMSessionClient::~CDMSessionClient):
     60        (WebCore::CDMSession::CDMSession):
     61        (WebCore::CDMSession::~CDMSession):
     62        (WebCore::CDMSession::type):
     63        (WebCore::CDMSession::cachedKeyForKeyID):
     64        * platform/graphics/MediaPlayer.h:
     65        * platform/graphics/avfoundation/CDMPrivateMediaSourceAVFObjC.h:
     66        * platform/graphics/avfoundation/CDMPrivateMediaSourceAVFObjC.mm:
     67        * platform/graphics/avfoundation/objc/CDMSessionAVContentKeySession.mm:
     68        * platform/graphics/avfoundation/objc/CDMSessionAVFoundationObjC.h:
     69        * platform/graphics/avfoundation/objc/CDMSessionAVFoundationObjC.mm:
     70        * platform/graphics/avfoundation/objc/CDMSessionAVStreamSession.mm:
     71        * platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.h:
     72        * testing/Internals.cpp:
     73        * testing/LegacyMockCDM.cpp: Renamed from Source/WebCore/testing/MockCDM.cpp.
     74        (WebCore::MockCDMSession::~MockCDMSession):
     75        (WebCore::MockCDM::supportsKeySystem):
     76        (WebCore::MockCDM::supportsKeySystemAndMimeType):
     77        (WebCore::MockCDM::supportsMIMEType):
     78        (WebCore::MockCDM::createSession):
     79        (WebCore::initDataPrefix):
     80        (WebCore::keyPrefix):
     81        (WebCore::keyRequest):
     82        (WebCore::generateSessionId):
     83        (WebCore::MockCDMSession::MockCDMSession):
     84        (WebCore::MockCDMSession::generateKeyRequest):
     85        (WebCore::MockCDMSession::releaseKeys):
     86        (WebCore::MockCDMSession::update):
     87        * testing/LegacyMockCDM.h: Renamed from Source/WebCore/testing/MockCDM.h.
     88        (WebCore::MockCDM::MockCDM):
     89        (WebCore::MockCDM::~MockCDM):
     90
    1912016-12-16  Andreas Kling  <akling@apple.com>
    292

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

    r209935 r209936  
    2828#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
    2929
    30 #include "CDM.h"
     30#include "LegacyCDM.h"
    3131
    32 #include "CDMPrivateClearKey.h"
    33 #include "CDMPrivateMediaPlayer.h"
    34 #include "CDMSession.h"
     32#include "LegacyCDMPrivateClearKey.h"
     33#include "LegacyCDMPrivateMediaPlayer.h"
     34#include "LegacyCDMSession.h"
    3535#include "MediaPlayer.h"
    3636#include "WebKitMediaKeys.h"

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

    r209935 r209936  
    2828#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
    2929
    30 #include "CDMSession.h"
     30#include "LegacyCDMSession.h"
    3131#include <runtime/Uint8Array.h>
    3232#include <wtf/Forward.h>

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

    r209935 r209936  
    2525
    2626#include "config.h"
    27 #include "CDMPrivateClearKey.h"
     27#include "LegacyCDMPrivateClearKey.h"
    2828
    2929#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
    3030
    31 #include "CDM.h"
    32 #include "CDMSessionClearKey.h"
     31#include "LegacyCDM.h"
     32#include "LegacyCDMSessionClearKey.h"
    3333#include "ContentType.h"
    3434#include "MediaPlayer.h"

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

    r209935 r209936  
    2828#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
    2929
    30 #include "CDMPrivate.h"
     30#include "LegacyCDMPrivate.h"
    3131
    3232namespace WebCore {

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

    r209935 r209936  
    2525
    2626#include "config.h"
    27 #include "CDMPrivateMediaPlayer.h"
     27#include "LegacyCDMPrivateMediaPlayer.h"
    2828
    2929#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
    3030
    31 #include "CDM.h"
    32 #include "CDMSession.h"
     31#include "LegacyCDM.h"
     32#include "LegacyCDMSession.h"
    3333#include "ContentType.h"
    3434#include "MediaPlayer.h"

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

    r209935 r209936  
    2626#pragma once
    2727
    28 #include "CDMPrivate.h"
     28#include "LegacyCDMPrivate.h"
    2929
    3030#if ENABLE(LEGACY_ENCRYPTED_MEDIA)

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

    r209935 r209936  
    2525
    2626#include "config.h"
    27 #include "CDMSessionClearKey.h"
     27#include "LegacyCDMSessionClearKey.h"
    2828
    2929#include "ArrayValue.h"

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

    r209935 r209936  
    2626#pragma once
    2727
    28 #include "CDMSession.h"
     28#include "LegacyCDMSession.h"
    2929#include <wtf/HashMap.h>
    3030

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

    r206984 r209936  
    2929
    3030#include "ActiveDOMObject.h"
    31 #include "CDMSession.h"
     31#include "LegacyCDMSession.h"
    3232#include "EventTarget.h"
    3333#include "ExceptionOr.h"

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

    r206984 r209936  
    2828#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
    2929
    30 #include "CDM.h"
     30#include "LegacyCDM.h"
    3131#include "ExceptionOr.h"
    3232#include <runtime/Uint8Array.h>

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

    r209927 r209936  
    58405840                CDA98E0416039E1A00FEA3B1 /* JSWebKitMediaKeys.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDA98DCE1601597900FEA3B1 /* JSWebKitMediaKeys.cpp */; };
    58415841                CDA98E0616039E1F00FEA3B1 /* JSWebKitMediaKeySession.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDA98DD01601597900FEA3B1 /* JSWebKitMediaKeySession.cpp */; };
    5842                 CDA98E0B1603CD6000FEA3B1 /* CDM.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDA98E091603CD5900FEA3B1 /* CDM.cpp */; };
     5842                CDA98E0B1603CD6000FEA3B1 /* LegacyCDM.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDA98E091603CD5900FEA3B1 /* LegacyCDM.cpp */; };
    58435843                CDAA8D0A14D71B2E0061EA60 /* PlatformClockCM.mm in Sources */ = {isa = PBXBuildFile; fileRef = CDAA8D0814D385600061EA60 /* PlatformClockCM.mm */; };
    58445844                CDAB6D2817C7DE6C00C60B34 /* MediaControlsHost.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDAB6D2617C7DE6C00C60B34 /* MediaControlsHost.cpp */; };
    … …  
    58525852                CDBEAEAC19D92B6C00BEBA88 /* MediaSelectionGroupAVFObjC.mm in Sources */ = {isa = PBXBuildFile; fileRef = CDBEAEAA19D92B6C00BEBA88 /* MediaSelectionGroupAVFObjC.mm */; };
    58535853                CDBEAEAD19D92B6C00BEBA88 /* MediaSelectionGroupAVFObjC.h in Headers */ = {isa = PBXBuildFile; fileRef = CDBEAEAB19D92B6C00BEBA88 /* MediaSelectionGroupAVFObjC.h */; };
    5854                 CDC26B40160A8CC60026757B /* MockCDM.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDC26B3C160A62B00026757B /* MockCDM.cpp */; };
    5855                 CDC26B41160A8CCE0026757B /* MockCDM.h in Headers */ = {isa = PBXBuildFile; fileRef = CDC26B3D160A62B00026757B /* MockCDM.h */; };
     5854                CDC26B40160A8CC60026757B /* LegacyMockCDM.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDC26B3C160A62B00026757B /* LegacyMockCDM.cpp */; };
     5855                CDC26B41160A8CCE0026757B /* LegacyMockCDM.h in Headers */ = {isa = PBXBuildFile; fileRef = CDC26B3D160A62B00026757B /* LegacyMockCDM.h */; };
    58565856                CDC69DD61632026C007C38DF /* WebCoreFullScreenWarningView.h in Headers */ = {isa = PBXBuildFile; fileRef = CDC69DD41632026C007C38DF /* WebCoreFullScreenWarningView.h */; settings = {ATTRIBUTES = (Private, ); }; };
    58575857                CDC69DD71632026C007C38DF /* WebCoreFullScreenWarningView.mm in Sources */ = {isa = PBXBuildFile; fileRef = CDC69DD51632026C007C38DF /* WebCoreFullScreenWarningView.mm */; };
    … …  
    58695869                CDC979F41C498C0900DB50D4 /* WebCoreNSErrorExtras.mm in Sources */ = {isa = PBXBuildFile; fileRef = CDC979F21C498C0900DB50D4 /* WebCoreNSErrorExtras.mm */; };
    58705870                CDC979F51C498C0900DB50D4 /* WebCoreNSErrorExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = CDC979F31C498C0900DB50D4 /* WebCoreNSErrorExtras.h */; };
    5871                 CDCA98EB18B2C8EB00C12FF9 /* CDMPrivateMediaPlayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDCA98EA18B2C8EB00C12FF9 /* CDMPrivateMediaPlayer.cpp */; };
     5871                CDCA98EB18B2C8EB00C12FF9 /* LegacyCDMPrivateMediaPlayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDCA98EA18B2C8EB00C12FF9 /* LegacyCDMPrivateMediaPlayer.cpp */; };
    58725872                CDCD41E71C3DDB0900965D99 /* ParsedContentRange.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDCD41E51C3DDB0900965D99 /* ParsedContentRange.cpp */; };
    58735873                CDCD41E81C3DDB0A00965D99 /* ParsedContentRange.h in Headers */ = {isa = PBXBuildFile; fileRef = CDCD41E61C3DDB0900965D99 /* ParsedContentRange.h */; settings = {ATTRIBUTES = (Private, ); }; };
    … …  
    58785878                CDD7089718359F6F002B3DC6 /* SampleMap.h in Headers */ = {isa = PBXBuildFile; fileRef = CDD7089518359F6F002B3DC6 /* SampleMap.h */; };
    58795879                CDDC1E7A18A952F30027A9D4 /* MediaSourcePrivateClient.h in Headers */ = {isa = PBXBuildFile; fileRef = CDDC1E7918A952F30027A9D4 /* MediaSourcePrivateClient.h */; };
    5880                 CDDD571518B57A8200A94FCB /* CDMSession.h in Headers */ = {isa = PBXBuildFile; fileRef = CDDE02E918B3DFC700CF7FF1 /* CDMSession.h */; settings = {ATTRIBUTES = (Private, ); }; };
    58815880                CDDE02ED18B3ED6D00CF7FF1 /* CDMSessionAVFoundationObjC.mm in Sources */ = {isa = PBXBuildFile; fileRef = CDDE02EB18B3ED6D00CF7FF1 /* CDMSessionAVFoundationObjC.mm */; };
    58825881                CDDE02F018B5651300CF7FF1 /* CDMSessionAVStreamSession.mm in Sources */ = {isa = PBXBuildFile; fileRef = CDDE02EF18B5651200CF7FF1 /* CDMSessionAVStreamSession.mm */; };
    … …  
    58925891                CDE83DB2183C44060031EAA3 /* VideoPlaybackQuality.h in Headers */ = {isa = PBXBuildFile; fileRef = CDE83DB0183C44060031EAA3 /* VideoPlaybackQuality.h */; };
    58935892                CDE83DB6183D352A0031EAA3 /* JSVideoPlaybackQuality.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDE83DB4183D352A0031EAA3 /* JSVideoPlaybackQuality.cpp */; };
    5894                 CDE8B5EC1A69777300B4B66A /* CDMPrivateClearKey.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDE8B5EA1A69777300B4B66A /* CDMPrivateClearKey.cpp */; };
    5895                 CDE8B5ED1A69777300B4B66A /* CDMPrivateClearKey.h in Headers */ = {isa = PBXBuildFile; fileRef = CDE8B5EB1A69777300B4B66A /* CDMPrivateClearKey.h */; };
    5896                 CDE8B5F01A69778B00B4B66A /* CDMSessionClearKey.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDE8B5EE1A69778B00B4B66A /* CDMSessionClearKey.cpp */; };
    5897                 CDE8B5F11A69778B00B4B66A /* CDMSessionClearKey.h in Headers */ = {isa = PBXBuildFile; fileRef = CDE8B5EF1A69778B00B4B66A /* CDMSessionClearKey.h */; };
     5893                CDE8B5EC1A69777300B4B66A /* LegacyCDMPrivateClearKey.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDE8B5EA1A69777300B4B66A /* LegacyCDMPrivateClearKey.cpp */; };
     5894                CDE8B5ED1A69777300B4B66A /* LegacyCDMPrivateClearKey.h in Headers */ = {isa = PBXBuildFile; fileRef = CDE8B5EB1A69777300B4B66A /* LegacyCDMPrivateClearKey.h */; };
     5895                CDE8B5F01A69778B00B4B66A /* LegacyCDMSessionClearKey.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDE8B5EE1A69778B00B4B66A /* LegacyCDMSessionClearKey.cpp */; };
     5896                CDE8B5F11A69778B00B4B66A /* LegacyCDMSessionClearKey.h in Headers */ = {isa = PBXBuildFile; fileRef = CDE8B5EF1A69778B00B4B66A /* LegacyCDMSessionClearKey.h */; };
    58985897                CDEA763014608A53008B31F1 /* PlatformClockCA.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDEA762E146084DE008B31F1 /* PlatformClockCA.cpp */; };
    58995898                CDEA76341460B56F008B31F1 /* ClockGeneric.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDEA76321460AE29008B31F1 /* ClockGeneric.cpp */; };
    … …  
    59135912                CDF2B0171820540700F2B424 /* MockSourceBufferPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = CDF2B00D1820540600F2B424 /* MockSourceBufferPrivate.h */; };
    59145913                CDF2B0191820540700F2B424 /* MockTracks.h in Headers */ = {isa = PBXBuildFile; fileRef = CDF2B00F1820540600F2B424 /* MockTracks.h */; };
     5914                CDF4B7121E0087AE00E235A2 /* LegacyCDMSession.h in Headers */ = {isa = PBXBuildFile; fileRef = CDDE02E918B3DFC700CF7FF1 /* LegacyCDMSession.h */; settings = {ATTRIBUTES = (Private, ); }; };
    59155915                CDF65CC8145B1E7500C4C7AA /* MediaController.h in Headers */ = {isa = PBXBuildFile; fileRef = CD27F6E4145767870078207D /* MediaController.h */; settings = {ATTRIBUTES = (Private, ); }; };
    59165916                CDF65CCA145B448800C4C7AA /* MediaControllerInterface.h in Headers */ = {isa = PBXBuildFile; fileRef = CDF65CC9145B43A700C4C7AA /* MediaControllerInterface.h */; settings = {ATTRIBUTES = (Private, ); }; };
    … …  
    1378813788                CDA98DDD16026A1900FEA3B1 /* JSWebKitMediaKeyNeededEvent.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = JSWebKitMediaKeyNeededEvent.cpp; sourceTree = "<group>"; };
    1378913789                CDA98DDE16026A1900FEA3B1 /* JSWebKitMediaKeyNeededEvent.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JSWebKitMediaKeyNeededEvent.h; sourceTree = "<group>"; };
    13790                 CDA98E091603CD5900FEA3B1 /* CDM.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CDM.cpp; sourceTree = "<group>"; };
    13791                 CDA98E0A1603CD5900FEA3B1 /* CDM.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CDM.h; sourceTree = "<group>"; };
    13792                 CDA98E0C1603CF3C00FEA3B1 /* CDMPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CDMPrivate.h; sourceTree = "<group>"; };
     13790                CDA98E091603CD5900FEA3B1 /* LegacyCDM.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = LegacyCDM.cpp; sourceTree = "<group>"; };
     13791                CDA98E0A1603CD5900FEA3B1 /* LegacyCDM.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LegacyCDM.h; sourceTree = "<group>"; };
     13792                CDA98E0C1603CF3C00FEA3B1 /* LegacyCDMPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LegacyCDMPrivate.h; sourceTree = "<group>"; };
    1379313793                CDAA8D0714D385600061EA60 /* PlatformClockCM.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlatformClockCM.h; sourceTree = "<group>"; };
    1379413794                CDAA8D0814D385600061EA60 /* PlatformClockCM.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PlatformClockCM.mm; sourceTree = "<group>"; };
    … …  
    1380713807                CDBEAEAB19D92B6C00BEBA88 /* MediaSelectionGroupAVFObjC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaSelectionGroupAVFObjC.h; sourceTree = "<group>"; };
    1380813808                CDC1DD4117CC2C48008CB55D /* mediaControlsApple.css */ = {isa = PBXFileReference; lastKnownFileType = text.css; path = mediaControlsApple.css; sourceTree = "<group>"; };
    13809                 CDC26B3C160A62B00026757B /* MockCDM.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = MockCDM.cpp; sourceTree = "<group>"; };
    13810                 CDC26B3D160A62B00026757B /* MockCDM.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MockCDM.h; sourceTree = "<group>"; };
     13809                CDC26B3C160A62B00026757B /* LegacyMockCDM.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = LegacyMockCDM.cpp; sourceTree = "<group>"; };
     13810                CDC26B3D160A62B00026757B /* LegacyMockCDM.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LegacyMockCDM.h; sourceTree = "<group>"; };
    1381113811                CDC69DD41632026C007C38DF /* WebCoreFullScreenWarningView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebCoreFullScreenWarningView.h; sourceTree = "<group>"; };
    1381213812                CDC69DD51632026C007C38DF /* WebCoreFullScreenWarningView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebCoreFullScreenWarningView.mm; sourceTree = "<group>"; };
    … …  
    1382413824                CDC979F21C498C0900DB50D4 /* WebCoreNSErrorExtras.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebCoreNSErrorExtras.mm; sourceTree = "<group>"; };
    1382513825                CDC979F31C498C0900DB50D4 /* WebCoreNSErrorExtras.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebCoreNSErrorExtras.h; sourceTree = "<group>"; };
    13826                 CDCA98E918B2C8D000C12FF9 /* CDMPrivateMediaPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CDMPrivateMediaPlayer.h; sourceTree = "<group>"; };
    13827                 CDCA98EA18B2C8EB00C12FF9 /* CDMPrivateMediaPlayer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CDMPrivateMediaPlayer.cpp; sourceTree = "<group>"; };
     13826                CDCA98E918B2C8D000C12FF9 /* LegacyCDMPrivateMediaPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LegacyCDMPrivateMediaPlayer.h; sourceTree = "<group>"; };
     13827                CDCA98EA18B2C8EB00C12FF9 /* LegacyCDMPrivateMediaPlayer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LegacyCDMPrivateMediaPlayer.cpp; sourceTree = "<group>"; };
    1382813828                CDCD41E51C3DDB0900965D99 /* ParsedContentRange.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ParsedContentRange.cpp; sourceTree = "<group>"; };
    1382913829                CDCD41E61C3DDB0900965D99 /* ParsedContentRange.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ParsedContentRange.h; sourceTree = "<group>"; };
    … …  
    1383513835                CDD7089518359F6F002B3DC6 /* SampleMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SampleMap.h; sourceTree = "<group>"; };
    1383613836                CDDC1E7918A952F30027A9D4 /* MediaSourcePrivateClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaSourcePrivateClient.h; sourceTree = "<group>"; };
    13837                 CDDE02E918B3DFC700CF7FF1 /* CDMSession.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CDMSession.h; sourceTree = "<group>"; };
     13837                CDDE02E918B3DFC700CF7FF1 /* LegacyCDMSession.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LegacyCDMSession.h; sourceTree = "<group>"; };
    1383813838                CDDE02EA18B3ED6D00CF7FF1 /* CDMSessionAVFoundationObjC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CDMSessionAVFoundationObjC.h; sourceTree = "<group>"; };
    1383913839                CDDE02EB18B3ED6D00CF7FF1 /* CDMSessionAVFoundationObjC.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CDMSessionAVFoundationObjC.mm; sourceTree = "<group>"; };
    … …  
    1385513855                CDE83DB4183D352A0031EAA3 /* JSVideoPlaybackQuality.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSVideoPlaybackQuality.cpp; sourceTree = "<group>"; };
    1385613856                CDE83DB5183D352A0031EAA3 /* JSVideoPlaybackQuality.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSVideoPlaybackQuality.h; sourceTree = "<group>"; };
    13857                 CDE8B5EA1A69777300B4B66A /* CDMPrivateClearKey.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CDMPrivateClearKey.cpp; sourceTree = "<group>"; };
    13858                 CDE8B5EB1A69777300B4B66A /* CDMPrivateClearKey.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CDMPrivateClearKey.h; sourceTree = "<group>"; };
    13859                 CDE8B5EE1A69778B00B4B66A /* CDMSessionClearKey.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CDMSessionClearKey.cpp; sourceTree = "<group>"; };
    13860                 CDE8B5EF1A69778B00B4B66A /* CDMSessionClearKey.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CDMSessionClearKey.h; sourceTree = "<group>"; };
     13857                CDE8B5EA1A69777300B4B66A /* LegacyCDMPrivateClearKey.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LegacyCDMPrivateClearKey.cpp; sourceTree = "<group>"; };
     13858                CDE8B5EB1A69777300B4B66A /* LegacyCDMPrivateClearKey.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LegacyCDMPrivateClearKey.h; sourceTree = "<group>"; };
     13859                CDE8B5EE1A69778B00B4B66A /* LegacyCDMSessionClearKey.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LegacyCDMSessionClearKey.cpp; sourceTree = "<group>"; };
     13860                CDE8B5EF1A69778B00B4B66A /* LegacyCDMSessionClearKey.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LegacyCDMSessionClearKey.h; sourceTree = "<group>"; };
    1386113861                CDEA762C14608224008B31F1 /* Clock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Clock.h; sourceTree = "<group>"; };
    1386213862                CDEA762E146084DE008B31F1 /* PlatformClockCA.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PlatformClockCA.cpp; sourceTree = "<group>"; };
    … …  
    1635116351                        isa = PBXGroup;
    1635216352                        children = (
     16353                                CDA98E091603CD5900FEA3B1 /* LegacyCDM.cpp */,
     16354                                CDA98E0A1603CD5900FEA3B1 /* LegacyCDM.h */,
     16355                                CDA98E0C1603CF3C00FEA3B1 /* LegacyCDMPrivate.h */,
     16356                                CDE8B5EA1A69777300B4B66A /* LegacyCDMPrivateClearKey.cpp */,
     16357                                CDE8B5EB1A69777300B4B66A /* LegacyCDMPrivateClearKey.h */,
     16358                                CDCA98EA18B2C8EB00C12FF9 /* LegacyCDMPrivateMediaPlayer.cpp */,
     16359                                CDCA98E918B2C8D000C12FF9 /* LegacyCDMPrivateMediaPlayer.h */,
     16360                                CDE8B5EE1A69778B00B4B66A /* LegacyCDMSessionClearKey.cpp */,
     16361                                CDE8B5EF1A69778B00B4B66A /* LegacyCDMSessionClearKey.h */,
    1635316362                                2D0621421DA6398800A7FB26 /* WebKitMediaKeyMessageEvent.cpp */,
    1635416363                                2D0621431DA6398800A7FB26 /* WebKitMediaKeyMessageEvent.h */,
    … …  
    1655616565                                CD5393CB175DCCE600C07123 /* MemoryInfo.h */,
    1655716566                                CD5393CC175DCCE600C07123 /* MemoryInfo.idl */,
    16558                                 CDC26B3C160A62B00026757B /* MockCDM.cpp */,
    16559                                 CDC26B3D160A62B00026757B /* MockCDM.h */,
     16567                                CDC26B3C160A62B00026757B /* LegacyMockCDM.cpp */,
     16568                                CDC26B3D160A62B00026757B /* LegacyMockCDM.h */,
    1656016569                                A1BF6B801AA96C7D00AF4A8A /* MockContentFilter.cpp */,
    1656116570                                A1BF6B811AA96C7D00AF4A8A /* MockContentFilter.h */,
    … …  
    2155721566                                A89943270B42338700D7C802 /* BitmapImage.cpp */,
    2155821567                                A89943260B42338700D7C802 /* BitmapImage.h */,
    21559                                 CDDE02E918B3DFC700CF7FF1 /* CDMSession.h */,
     21568                                CDDE02E918B3DFC700CF7FF1 /* LegacyCDMSession.h */,
    2156021569                                B27535380B053814002CE64F /* Color.cpp */,
    2156121570                                B27535390B053814002CE64F /* Color.h */,
    … …  
    2275622765                        children = (
    2275722766                                2D0621461DA639EC00A7FB26 /* legacy */,
    22758                                 CDA98E091603CD5900FEA3B1 /* CDM.cpp */,
    22759                                 CDA98E0A1603CD5900FEA3B1 /* CDM.h */,
    22760                                 CDA98E0C1603CF3C00FEA3B1 /* CDMPrivate.h */,
    22761                                 CDE8B5EA1A69777300B4B66A /* CDMPrivateClearKey.cpp */,
    22762                                 CDE8B5EB1A69777300B4B66A /* CDMPrivateClearKey.h */,
    22763                                 CDCA98EA18B2C8EB00C12FF9 /* CDMPrivateMediaPlayer.cpp */,
    22764                                 CDCA98E918B2C8D000C12FF9 /* CDMPrivateMediaPlayer.h */,
    22765                                 CDE8B5EE1A69778B00B4B66A /* CDMSessionClearKey.cpp */,
    22766                                 CDE8B5EF1A69778B00B4B66A /* CDMSessionClearKey.h */,
    2276722767                                2D9BF72F1DBFDC0F007A7D99 /* MediaKeyMessageEvent.cpp */,
    2276822768                                2D9BF7301DBFDC0F007A7D99 /* MediaKeyMessageEvent.h */,
    … …  
    2477824778                                A19AEA211AAA808600B52B25 /* JSMockContentFilterSettings.h in Headers */,
    2477924779                                EBF5121D1696496C0056BD25 /* JSTypeConversions.h in Headers */,
    24780                                 CDC26B41160A8CCE0026757B /* MockCDM.h in Headers */,
     24780                                CDC26B41160A8CCE0026757B /* LegacyMockCDM.h in Headers */,
    2478124781                                A1BF6B831AA96C7D00AF4A8A /* MockContentFilter.h in Headers */,
    2478224782                                A1B5B29F1AAA846F008B6042 /* MockContentFilterSettings.h in Headers */,
    … …  
    2503925039                                CDC734151977896D0046BFC5 /* CARingBuffer.h in Headers */,
    2504025040                                6550B69E099DF0270090D781 /* CDATASection.h in Headers */,
    25041                                 CDE8B5ED1A69777300B4B66A /* CDMPrivateClearKey.h in Headers */,
     25041                                CDE8B5ED1A69777300B4B66A /* LegacyCDMPrivateClearKey.h in Headers */,
    2504225042                                CD318623199F1E2A0030A0F7 /* CDMPrivateMediaSourceAVFObjC.h in Headers */,
    25043                                 CDDD571518B57A8200A94FCB /* CDMSession.h in Headers */,
    25044                                 CDE8B5F11A69778B00B4B66A /* CDMSessionClearKey.h in Headers */,
     25043                                CDE8B5F11A69778B00B4B66A /* LegacyCDMSessionClearKey.h in Headers */,
    2504525044                                CDE595971BF26E2100A1CBE8 /* CDMSessionMediaSourceAVFObjC.h in Headers */,
    2504625045                                5FA904CA178E61F5004C8A2D /* CertificateInfo.h in Headers */,
    … …  
    2767027669                                9D6380101AF173220031A15C /* StyleSelfAlignmentData.h in Headers */,
    2767127670                                E47A3AC61C5EAC9D00CCBFA7 /* StyleSharingResolver.h in Headers */,
     27671                                CDF4B7121E0087AE00E235A2 /* LegacyCDMSession.h in Headers */,
    2767227672                                A8EA800C0A19516E00A8EF5F /* StyleSheet.h in Headers */,
    2767327673                                E4F9EEF3156DA00700D23E7E /* StyleSheetContents.h in Headers */,
    … …  
    2866828668                                2D4150DE1C1F868C000A3BA2 /* JSMockPageOverlay.cpp in Sources */,
    2866928669                                EBF5121C1696496C0056BD25 /* JSTypeConversions.cpp in Sources */,
    28670                                 CDC26B40160A8CC60026757B /* MockCDM.cpp in Sources */,
     28670                                CDC26B40160A8CC60026757B /* LegacyMockCDM.cpp in Sources */,
    2867128671                                A1BF6B821AA96C7D00AF4A8A /* MockContentFilter.cpp in Sources */,
    2867228672                                A1B5B29E1AAA846E008B6042 /* MockContentFilterSettings.cpp in Sources */,
    … …  
    2888828888                                CDC734141977896C0046BFC5 /* CARingBuffer.cpp in Sources */,
    2888928889                                6550B69D099DF0270090D781 /* CDATASection.cpp in Sources */,
    28890                                 CDA98E0B1603CD6000FEA3B1 /* CDM.cpp in Sources */,
    28891                                 CDE8B5EC1A69777300B4B66A /* CDMPrivateClearKey.cpp in Sources */,
    28892                                 CDCA98EB18B2C8EB00C12FF9 /* CDMPrivateMediaPlayer.cpp in Sources */,
     28890                                CDA98E0B1603CD6000FEA3B1 /* LegacyCDM.cpp in Sources */,
     28891                                CDE8B5EC1A69777300B4B66A /* LegacyCDMPrivateClearKey.cpp in Sources */,
     28892                                CDCA98EB18B2C8EB00C12FF9 /* LegacyCDMPrivateMediaPlayer.cpp in Sources */,
    2889328893                                CD318622199F1E2A0030A0F7 /* CDMPrivateMediaSourceAVFObjC.mm in Sources */,
    2889428894                                CDE595951BF16DF300A1CBE8 /* CDMSessionAVContentKeySession.mm in Sources */,
    2889528895                                CDDE02ED18B3ED6D00CF7FF1 /* CDMSessionAVFoundationObjC.mm in Sources */,
    2889628896                                CDDE02F018B5651300CF7FF1 /* CDMSessionAVStreamSession.mm in Sources */,
    28897                                 CDE8B5F01A69778B00B4B66A /* CDMSessionClearKey.cpp in Sources */,
     28897                                CDE8B5F01A69778B00B4B66A /* LegacyCDMSessionClearKey.cpp in Sources */,
    2889828898                                CDE5959D1BF2757100A1CBE8 /* CDMSessionMediaSourceAVFObjC.mm in Sources */,
    2889928899                                5F2DBBE9178E3C8100141486 /* CertificateInfoMac.mm in Sources */,

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

    r209730 r209936  
    157157#endif
    158158
     159#if ENABLE(ENCRYPTED_MEDIA)
     160#include "NotImplemented.h"
     161#endif
     162
    159163namespace WebCore {
    160164

  • trunk/Source/WebCore/platform/graphics/MediaPlayer.h

    r208151 r209936  
    3131
    3232#include "AudioTrackPrivate.h"
    33 #include "CDMSession.h"
     33#include "LegacyCDMSession.h"
    3434#include "InbandTextTrackPrivate.h"
    3535#include "IntRect.h"

  • trunk/Source/WebCore/platform/graphics/avfoundation/CDMPrivateMediaSourceAVFObjC.h

    r206811 r209936  
    2929#if ENABLE(LEGACY_ENCRYPTED_MEDIA) && ENABLE(MEDIA_SOURCE)
    3030
    31 #include "CDMPrivate.h"
     31#include "LegacyCDMPrivate.h"
    3232#include <wtf/Vector.h>
    3333

  • trunk/Source/WebCore/platform/graphics/avfoundation/CDMPrivateMediaSourceAVFObjC.mm

    r208688 r209936  
    2929#if ENABLE(LEGACY_ENCRYPTED_MEDIA) && ENABLE(MEDIA_SOURCE)
    3030
    31 #import "CDM.h"
    3231#import "CDMSessionAVContentKeySession.h"
    3332#import "CDMSessionAVStreamSession.h"
    3433#import "ContentType.h"
     34#import "LegacyCDM.h"
    3535#import "MediaPlayerPrivateMediaSourceAVFObjC.h"
    3636#import "WebCoreSystemInterface.h"

  • trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVContentKeySession.mm

    r208688 r209936  
    2929#if ENABLE(LEGACY_ENCRYPTED_MEDIA) && ENABLE(MEDIA_SOURCE)
    3030
    31 #import "CDM.h"
     31#import "LegacyCDM.h"
    3232#import "CDMPrivateMediaSourceAVFObjC.h"
    3333#import "FileSystem.h"

  • trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVFoundationObjC.h

    r206811 r209936  
    2727#define CDMSessionAVFoundationObjC_h
    2828
    29 #include "CDMSession.h"
     29#include "LegacyCDMSession.h"
    3030#include <wtf/RetainPtr.h>
    3131#include <wtf/WeakPtr.h>

  • trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVFoundationObjC.mm

    r208688 r209936  
    2929#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
    3030
    31 #import "CDM.h"
    32 #import "CDMSession.h"
     31#import "LegacyCDM.h"
     32#import "LegacyCDMSession.h"
    3333#import "MediaPlayer.h"
    3434#import "MediaPlayerPrivateAVFoundationObjC.h"

  • trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVStreamSession.mm

    r208688 r209936  
    3030
    3131#import "AVFoundationSPI.h"
    32 #import "CDM.h"
     32#import "LegacyCDM.h"
    3333#import "CDMPrivateMediaSourceAVFObjC.h"
    3434#import "FileSystem.h"

  • trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.h

    r206811 r209936  
    2727#define CDMSessionMediaSourceAVFObjC_h
    2828
    29 #include "CDMSession.h"
     29#include "LegacyCDMSession.h"
    3030#include "SourceBufferPrivateAVFObjC.h"
    3131#include <wtf/RetainPtr.h>

  • trunk/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.h

    r208985 r209936  
    157157    MediaSourcePrivateAVFObjC* m_mediaSource;
    158158    SourceBufferPrivateClient* m_client;
     159#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
    159160    CDMSessionMediaSourceAVFObjC* m_session { nullptr };
     161#endif
    160162
    161163    std::optional<FloatSize> m_cachedSize;

  • trunk/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm

    r209469 r209936  
    608608#else
    609609    UNUSED_PARAM(initData);
     610    UNUSED_PARAM(hasSessionSemaphore);
    610611#endif
    611612}
    … …  
    681682void SourceBufferPrivateAVFObjC::destroyParser()
    682683{
     684#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
    683685    if (m_mediaSource && m_mediaSource->player()->hasStreamSession())
    684686        [m_mediaSource->player()->streamSession() removeStreamDataParser:m_parser.get()];
     687#endif
    685688
    686689    [m_delegate invalidate];
    … …  
    802805void SourceBufferPrivateAVFObjC::setCDMSession(CDMSessionMediaSourceAVFObjC* session)
    803806{
     807#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
    804808    if (session == m_session)
    805809        return;
    … …  
    828832        }
    829833    }
     834#else
     835    UNUSED_PARAM(session);
     836#endif
    830837}
    831838

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

    r209826 r209936  
    159159
    160160#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
    161 #include "CDM.h"
    162 #include "MockCDM.h"
     161#include "LegacyCDM.h"
     162#include "LegacyMockCDM.h"
    163163#endif
    164164

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

    r209935 r209936  
    2525
    2626#include "config.h"
    27 #include "MockCDM.h"
     27#include "LegacyMockCDM.h"
    2828
    2929#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
    3030
    31 #include "CDM.h"
    32 #include "CDMSession.h"
     31#include "LegacyCDM.h"
     32#include "LegacyCDMSession.h"
    3333#include "WebKitMediaKeyError.h"
    3434#include <runtime/JSCInlines.h>

  • trunk/Source/WebCore/testing/LegacyMockCDM.h

    r209935 r209936  
    2828#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
    2929
    30 #include "CDMPrivate.h"
     30#include "LegacyCDMPrivate.h"
    3131
    3232namespace WebCore {
Note: See TracChangeset for help on using the changeset viewer.