Drop LEGACY_ENCRYPTED_MEDIA code.

WebPlatformForEmbedded · Nov 20, 2017 · db8ce0b · db8ce0b
1 parent c0aadeb
commit db8ce0b
Show file tree

Hide file tree

Showing 41 changed files with 40 additions and 1,603 deletions.
diff --git a/Source/WebCore/Modules/encryptedmedia/legacy/LegacyCDM.cpp b/Source/WebCore/Modules/encryptedmedia/legacy/LegacyCDM.cpp
@@ -24,10 +24,11 @@
  */
 
 #include "config.h"
-#include "LegacyCDM.h"
 
 #if ENABLE(LEGACY_ENCRYPTED_MEDIA)
 
+#include "LegacyCDM.h"
+
 #include "LegacyCDMPrivateClearKey.h"
 #include "LegacyCDMPrivateMediaPlayer.h"
 #include "LegacyCDMSession.h"

diff --git a/Source/WebCore/Modules/encryptedmedia/legacy/LegacyCDMPrivateClearKey.cpp b/Source/WebCore/Modules/encryptedmedia/legacy/LegacyCDMPrivateClearKey.cpp
@@ -28,9 +28,9 @@
 
 #if ENABLE(LEGACY_ENCRYPTED_MEDIA)
 
-#include "ContentType.h"
 #include "LegacyCDM.h"
 #include "LegacyCDMSessionClearKey.h"
+#include "ContentType.h"
 #include "MediaPlayer.h"
 
 namespace WebCore {

diff --git a/Source/WebCore/Modules/encryptedmedia/legacy/LegacyCDMPrivateMediaPlayer.cpp b/Source/WebCore/Modules/encryptedmedia/legacy/LegacyCDMPrivateMediaPlayer.cpp
@@ -28,9 +28,9 @@
 
 #if ENABLE(LEGACY_ENCRYPTED_MEDIA)
 
-#include "ContentType.h"
 #include "LegacyCDM.h"
 #include "LegacyCDMSession.h"
+#include "ContentType.h"
 #include "MediaPlayer.h"
 
 #if PLATFORM(IOS)

diff --git a/Source/WebCore/Modules/encryptedmedia/legacy/WebKitMediaKeySession.h b/Source/WebCore/Modules/encryptedmedia/legacy/WebKitMediaKeySession.h
@@ -28,10 +28,10 @@
 #if ENABLE(LEGACY_ENCRYPTED_MEDIA)
 
 #include "ActiveDOMObject.h"
+#include "LegacyCDMSession.h"
 #include "EventTarget.h"
 #include "ExceptionOr.h"
 #include "GenericEventQueue.h"
-#include "LegacyCDMSession.h"
 #include "Timer.h"
 #include <runtime/Uint8Array.h>
 #include <wtf/Deque.h>

diff --git a/Source/WebCore/Modules/encryptedmedia/legacy/WebKitMediaKeys.h b/Source/WebCore/Modules/encryptedmedia/legacy/WebKitMediaKeys.h
@@ -27,8 +27,8 @@
 
 #if ENABLE(LEGACY_ENCRYPTED_MEDIA)
 
-#include "ExceptionOr.h"
 #include "LegacyCDM.h"
+#include "ExceptionOr.h"
 
 #include <runtime/Uint8Array.h>
 #include <wtf/Vector.h>

diff --git a/Source/WebCore/dom/Element.idl b/Source/WebCore/dom/Element.idl
@@ -130,7 +130,7 @@
     [NotEnumerable] attribute EventHandler onbeforeload;
 
     // Non standard event handler (https://developer.apple.com/reference/webkitjs/element/1634205-onwebkitneedkey).
-    [NotEnumerable, Conditional=LEGACY_ENCRYPTED_MEDIA] attribute EventHandler onwebkitneedkey;
+    [NotEnumerable, Conditional=LEGACY_ENCRYPTED_MEDIA, EnabledAtRuntime=LegacyEncryptedMediaAPI] attribute EventHandler onwebkitneedkey;
 
     // Non standard event handler (https://developer.apple.com/reference/webkitjs/element/1633943-onwebkitpresentationmodechanged).
     [NotEnumerable, Conditional=VIDEO_PRESENTATION_MODE] attribute EventHandler onwebkitpresentationmodechanged;

diff --git a/Source/WebCore/html/HTMLMediaElement.cpp b/Source/WebCore/html/HTMLMediaElement.cpp
@@ -1145,13 +1145,12 @@ HTMLMediaElement::NetworkState HTMLMediaElement::networkState() const
     return m_networkState;
 }
 
-String HTMLMediaElement::canPlayType(const String& mimeType, const String& keySystem) const
+String HTMLMediaElement::canPlayType(const String& mimeType) const
 {
     MediaEngineSupportParameters parameters;
     ContentType contentType(mimeType);
     parameters.type = contentType;
     parameters.contentTypesRequiringHardwareSupport = mediaContentTypesRequiringHardwareSupport();
-    UNUSED_PARAM(keySystem);
     MediaPlayer::SupportsType support = MediaPlayer::supportsType(parameters, this);
     String canPlay;
 

diff --git a/Source/WebCore/html/HTMLMediaElement.h b/Source/WebCore/html/HTMLMediaElement.h
@@ -216,7 +216,7 @@ class HTMLMediaElement
 
     Ref<TimeRanges> buffered() const override;
     WEBCORE_EXPORT void load();
-    WEBCORE_EXPORT String canPlayType(const String& mimeType, const String& keySystem = String()) const;
+    WEBCORE_EXPORT String canPlayType(const String& mimeType) const;
 
 // ready state
     using HTMLMediaElementEnums::ReadyState;

diff --git a/Source/WebCore/html/HTMLMediaElement.idl b/Source/WebCore/html/HTMLMediaElement.idl
@@ -59,11 +59,7 @@ typedef (
     readonly attribute TimeRanges buffered;
     void load();
 
-#if defined(ENABLE_LEGACY_ENCRYPTED_MEDIA) && ENABLE_LEGACY_ENCRYPTED_MEDIA
-    DOMString canPlayType(DOMString type, optional DOMString? keySystem = null);
-#else
     DOMString canPlayType(DOMString type);
-#endif
 
     // ready state
     const unsigned short HAVE_NOTHING = 0;

diff --git a/Source/WebCore/platform/GStreamer.cmake b/Source/WebCore/platform/GStreamer.cmake
@@ -137,45 +137,6 @@ if (ENABLE_WEB_AUDIO)
     )
 endif ()
 
-if (ENABLE_LEGACY_ENCRYPTED_MEDIA)
-    list(APPEND WebCore_INCLUDE_DIRECTORIES
-        ${LIBGCRYPT_INCLUDE_DIRS}
-    )
-    list(APPEND WebCore_LIBRARIES
-        ${LIBGCRYPT_LIBRARIES} -lgpg-error
-    )
-
-    if (ENABLE_PLAYREADY)
-        list(APPEND WebCore_LIBRARIES
-            ${PLAYREADY_LIBRARIES}
-        )
-        list(APPEND WebCore_INCLUDE_DIRECTORIES
-            ${PLAYREADY_INCLUDE_DIRS}
-        )
-        add_definitions(${PLAYREADY_CFLAGS_OTHER})
-        foreach(p ${PLAYREADY_INCLUDE_DIRS})
-            if (EXISTS "${p}/playready.cmake")
-                include("${p}/playready.cmake")
-            endif()
-        endforeach()
-        list(APPEND WebCore_SOURCES
-            platform/graphics/gstreamer/eme/CDMPRSessionGStreamer.cpp
-            platform/graphics/gstreamer/eme/PlayreadySession.cpp
-            platform/graphics/gstreamer/eme/WebKitPlayReadyDecryptorGStreamer.cpp
-        )
-    endif ()
-
-    if (ENABLE_OPENCDM)
-        list(APPEND WebCore_SOURCES
-            platform/graphics/gstreamer/eme/CDMPrivateOpenCDM.cpp
-            platform/graphics/gstreamer/eme/CDMSessionOpenCDM.cpp
-            platform/graphics/gstreamer/eme/WebKitOpenCDMDecryptorGStreamer.cpp
-            platform/graphics/gstreamer/eme/WebKitOpenCDMPlayReadyDecryptorGStreamer.cpp
-            platform/graphics/gstreamer/eme/WebKitOpenCDMWidevineDecryptorGStreamer.cpp
-        )
-    endif ()
-endif ()
-
 if (ENABLE_ENCRYPTED_MEDIA)
     list(APPEND WebCore_INCLUDE_DIRECTORIES
         "${WEBCORE_DIR}/platform/encryptedmedia/clearkey"

diff --git a/Source/WebCore/platform/graphics/CDMSession.h b/Source/WebCore/platform/graphics/CDMSession.h
diff --git a/Source/WebCore/platform/graphics/MediaPlayer.h b/Source/WebCore/platform/graphics/MediaPlayer.h
@@ -390,9 +390,7 @@ class MediaPlayer : public MediaPlayerEnums, public RefCounted<MediaPlayer> {
     // Represents synchronous exceptions that can be thrown from the Encrypted Media methods.
     // This is different from the asynchronous MediaKeyError.
     enum MediaKeyException { NoError, InvalidPlayerState, KeySystemNotSupported };
-#endif
 
-#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
     std::unique_ptr<CDMSession> createSession(const String& keySystem, CDMSessionClient*);
     void setCDMSession(CDMSession*);
     void keyAdded();

diff --git a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
@@ -1163,17 +1163,12 @@ void MediaPlayerPrivateGStreamer::handleMessage(GstMessage* message)
                 m_buffering = false;
                 updateStates();
             }
-#if ENABLE(LEGACY_ENCRYPTED_MEDIA) || ENABLE(ENCRYPTED_MEDIA)
+#if ENABLE(ENCRYPTED_MEDIA)
             else if (gst_structure_has_name(structure, "drm-key-needed")) {
                 GST_DEBUG("drm-key-needed message from %s", GST_MESSAGE_SRC_NAME(message));
                 GRefPtr<GstEvent> event;
                 gst_structure_get(structure, "event", GST_TYPE_EVENT, &event.outPtr(), nullptr);
-#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
-                handleProtectionEvent(event.get(), GST_ELEMENT(message->src));
-#endif
-#if ENABLE(ENCRYPTED_MEDIA)
                 handleProtectionEvent(event.get());
-#endif
             }
 #endif
         }