diff --git a/Libraries/LibWeb/EncryptedMediaExtensions/Algorithms.cpp b/Libraries/LibWeb/EncryptedMediaExtensions/Algorithms.cpp index 8329b950d30..d9fc713e8d7 100644 --- a/Libraries/LibWeb/EncryptedMediaExtensions/Algorithms.cpp +++ b/Libraries/LibWeb/EncryptedMediaExtensions/Algorithms.cpp @@ -16,13 +16,13 @@ bool supports_container([[maybe_unused]] Utf16String const& container) } // https://w3c.github.io/encrypted-media/#get-supported-capabilities-for-audio-video-type -Optional> get_supported_capabilities_for_audio_video_type(KeySystem const& implementation, CapabilitiesType type, Vector requested_capabilities, Bindings::MediaKeySystemConfiguration config, MediaKeyRestrictions restrictions) +Optional> get_supported_capabilities_for_audio_video_type(KeySystem const& implementation, CapabilitiesType type, Vector requested_capabilities, MediaKeySystemConfiguration config, MediaKeyRestrictions restrictions) { // 1. Let local accumulated configuration be a local copy of accumulated configuration. - Bindings::MediaKeySystemConfiguration accumulated_configuration = config; + MediaKeySystemConfiguration accumulated_configuration = config; // 2. Let supported media capabilities be an empty sequence of MediaKeySystemMediaCapability dictionaries. - Vector supported_media_capabilities; + Vector supported_media_capabilities; // 3. For each requested media capability in requested media capabilities: for (auto& capability : requested_capabilities) { @@ -143,7 +143,7 @@ bool is_persistent_session_type(Utf16String const& session_type) } // https://w3c.github.io/encrypted-media/#get-consent-status -ConsentStatus get_consent_status(Bindings::MediaKeySystemConfiguration const& accumulated_configuration, MediaKeyRestrictions& restrictions, URL::Origin const& origin) +ConsentStatus get_consent_status(MediaKeySystemConfiguration const& accumulated_configuration, MediaKeyRestrictions& restrictions, URL::Origin const& origin) { // FIXME: Implement this (void)accumulated_configuration; @@ -156,10 +156,10 @@ ConsentStatus get_consent_status(Bindings::MediaKeySystemConfiguration const& ac } // https://w3c.github.io/encrypted-media/#get-supported-configuration-and-consent -Optional get_supported_configuration_and_consent(KeySystem const& implementation, Bindings::MediaKeySystemConfiguration const& candidate_configuration, MediaKeyRestrictions& restrictions, URL::Origin const& origin) +Optional get_supported_configuration_and_consent(KeySystem const& implementation, MediaKeySystemConfiguration const& candidate_configuration, MediaKeyRestrictions& restrictions, URL::Origin const& origin) { // 1. Let accumulated configuration be a new MediaKeySystemConfiguration dictionary. - Bindings::MediaKeySystemConfiguration accumulated_configuration; + MediaKeySystemConfiguration accumulated_configuration; // 2. Set the label member of accumulated configuration to equal the label member of candidate configuration. accumulated_configuration.label = candidate_configuration.label; @@ -293,7 +293,7 @@ Optional get_supported_configuration_and_consent(KeySystem // Otherwise: else { // 1. Set the videoCapabilities member of accumulated configuration to an empty sequence. - accumulated_configuration.video_capabilities = Vector {}; + accumulated_configuration.video_capabilities = Vector {}; } // 1. If the audioCapabilities member in candidate configuration is non-empty: @@ -312,7 +312,7 @@ Optional get_supported_configuration_and_consent(KeySystem // Otherwise: else { // 1. Set the audioCapabilities member of accumulated configuration to an empty sequence. - accumulated_configuration.audio_capabilities = Vector {}; + accumulated_configuration.audio_capabilities = Vector {}; } // 18. If accumulated configuration's distinctiveIdentifier value is "optional", follow the steps for the first matching condition from the following list: @@ -373,7 +373,7 @@ Optional get_supported_configuration_and_consent(KeySystem } // https://w3c.github.io/encrypted-media/#get-supported-configuration -Optional get_supported_configuration(KeySystem const& implementation, Bindings::MediaKeySystemConfiguration const& candidate_configuration, URL::Origin const& origin) +Optional get_supported_configuration(KeySystem const& implementation, MediaKeySystemConfiguration const& candidate_configuration, URL::Origin const& origin) { // 1. Let supported configuration be ConsentDenied. Optional supported_configuration = ConsentConfiguration { ConsentStatus::ConsentDenied, {} }; diff --git a/Libraries/LibWeb/EncryptedMediaExtensions/Algorithms.h b/Libraries/LibWeb/EncryptedMediaExtensions/Algorithms.h index 05b3bcc17d1..1380e5b7927 100644 --- a/Libraries/LibWeb/EncryptedMediaExtensions/Algorithms.h +++ b/Libraries/LibWeb/EncryptedMediaExtensions/Algorithms.h @@ -19,9 +19,9 @@ bool supports_container(Utf16String const& container); bool is_persistent_session_type(Utf16String const& session_type); bool is_supported_key_system(Utf16String const& key_system); NonnullOwnPtr key_system_from_string(Utf16String const& key_system); -ConsentStatus get_consent_status(Bindings::MediaKeySystemConfiguration const&, MediaKeyRestrictions&, URL::Origin const&); -Optional> get_supported_capabilities_for_audio_video_type(KeySystem const&, CapabilitiesType, Vector, Bindings::MediaKeySystemConfiguration, MediaKeyRestrictions); -Optional get_supported_configuration_and_consent(KeySystem const&, Bindings::MediaKeySystemConfiguration const&, MediaKeyRestrictions&, URL::Origin const&); -Optional get_supported_configuration(KeySystem const&, Bindings::MediaKeySystemConfiguration const&, URL::Origin const&); +ConsentStatus get_consent_status(MediaKeySystemConfiguration const&, MediaKeyRestrictions&, URL::Origin const&); +Optional> get_supported_capabilities_for_audio_video_type(KeySystem const&, CapabilitiesType, Vector, MediaKeySystemConfiguration, MediaKeyRestrictions); +Optional get_supported_configuration_and_consent(KeySystem const&, MediaKeySystemConfiguration const&, MediaKeyRestrictions&, URL::Origin const&); +Optional get_supported_configuration(KeySystem const&, MediaKeySystemConfiguration const&, URL::Origin const&); } diff --git a/Libraries/LibWeb/EncryptedMediaExtensions/EncryptedMediaExtensions.h b/Libraries/LibWeb/EncryptedMediaExtensions/EncryptedMediaExtensions.h index d8838dab1c8..0a4d26d1921 100644 --- a/Libraries/LibWeb/EncryptedMediaExtensions/EncryptedMediaExtensions.h +++ b/Libraries/LibWeb/EncryptedMediaExtensions/EncryptedMediaExtensions.h @@ -10,7 +10,7 @@ #include #include -namespace Web::Bindings { +namespace Web::EncryptedMediaExtensions { // https://w3c.github.io/encrypted-media/#dom-mediakeysystemmediacapability struct MediaKeySystemMediaCapability { @@ -30,10 +30,6 @@ struct MediaKeySystemConfiguration { Optional> session_types; }; -} - -namespace Web::EncryptedMediaExtensions { - struct MediaKeyRestrictions { bool distinctive_identifiers { true }; bool persist_state { true }; @@ -52,7 +48,7 @@ enum ConsentStatus { struct ConsentConfiguration { ConsentStatus status { ConsentStatus::ConsentDenied }; - Optional configuration; + Optional configuration; }; } diff --git a/Libraries/LibWeb/EncryptedMediaExtensions/KeySystem.h b/Libraries/LibWeb/EncryptedMediaExtensions/KeySystem.h index 7c8275df386..a8aae3d20f9 100644 --- a/Libraries/LibWeb/EncryptedMediaExtensions/KeySystem.h +++ b/Libraries/LibWeb/EncryptedMediaExtensions/KeySystem.h @@ -18,7 +18,7 @@ public: virtual bool supports_init_data_type(Utf16String const& init_data_type) const = 0; virtual bool supports_encryption_scheme(Utf16String const& encryption_scheme) const = 0; virtual bool supports_robustness(Utf16String const& robustness) const = 0; - virtual bool definitely_supports_playback(Utf16String const& container, Utf16String const& media_types, Optional encryption_scheme, Utf16String const& robustness, Bindings::MediaKeySystemConfiguration const& accumulated_configuration, MediaKeyRestrictions const& restrictions) const = 0; + virtual bool definitely_supports_playback(Utf16String const& container, Utf16String const& media_types, Optional encryption_scheme, Utf16String const& robustness, MediaKeySystemConfiguration const& accumulated_configuration, MediaKeyRestrictions const& restrictions) const = 0; private: }; @@ -55,7 +55,7 @@ public: return robustness.is_empty(); } - virtual bool definitely_supports_playback(Utf16String const& container, Utf16String const& media_types, Optional encryption_scheme, Utf16String const& robustness, Bindings::MediaKeySystemConfiguration const& accumulated_configuration, MediaKeyRestrictions const& restrictions) const override + virtual bool definitely_supports_playback(Utf16String const& container, Utf16String const& media_types, Optional encryption_scheme, Utf16String const& robustness, MediaKeySystemConfiguration const& accumulated_configuration, MediaKeyRestrictions const& restrictions) const override { (void)container; (void)media_types; diff --git a/Libraries/LibWeb/EncryptedMediaExtensions/MediaKeySystemAccess.cpp b/Libraries/LibWeb/EncryptedMediaExtensions/MediaKeySystemAccess.cpp index c0c03cb2b7e..56de6b80c75 100644 --- a/Libraries/LibWeb/EncryptedMediaExtensions/MediaKeySystemAccess.cpp +++ b/Libraries/LibWeb/EncryptedMediaExtensions/MediaKeySystemAccess.cpp @@ -14,7 +14,7 @@ GC_DEFINE_ALLOCATOR(MediaKeySystemAccess); MediaKeySystemAccess::~MediaKeySystemAccess() = default; -MediaKeySystemAccess::MediaKeySystemAccess(JS::Realm& realm, Utf16String const& key_system, Bindings::MediaKeySystemConfiguration configuration, NonnullOwnPtr cdm_implementation) +MediaKeySystemAccess::MediaKeySystemAccess(JS::Realm& realm, Utf16String const& key_system, MediaKeySystemConfiguration configuration, NonnullOwnPtr cdm_implementation) : PlatformObject(realm) , m_key_system(key_system) , m_configuration(move(configuration)) @@ -22,7 +22,7 @@ MediaKeySystemAccess::MediaKeySystemAccess(JS::Realm& realm, Utf16String const& { } -GC::Ref MediaKeySystemAccess::create(JS::Realm& realm, Utf16String const& key_system, Bindings::MediaKeySystemConfiguration configuration, NonnullOwnPtr cdm_implementation) +GC::Ref MediaKeySystemAccess::create(JS::Realm& realm, Utf16String const& key_system, MediaKeySystemConfiguration configuration, NonnullOwnPtr cdm_implementation) { return realm.create(realm, key_system, configuration, move(cdm_implementation)); } diff --git a/Libraries/LibWeb/EncryptedMediaExtensions/MediaKeySystemAccess.h b/Libraries/LibWeb/EncryptedMediaExtensions/MediaKeySystemAccess.h index 5fb8abd70ca..63e0399a0e4 100644 --- a/Libraries/LibWeb/EncryptedMediaExtensions/MediaKeySystemAccess.h +++ b/Libraries/LibWeb/EncryptedMediaExtensions/MediaKeySystemAccess.h @@ -21,19 +21,19 @@ class MediaKeySystemAccess : public Bindings::PlatformObject { public: virtual ~MediaKeySystemAccess() override; - [[nodiscard]] static GC::Ref create(JS::Realm&, Utf16String const&, Bindings::MediaKeySystemConfiguration, NonnullOwnPtr); + [[nodiscard]] static GC::Ref create(JS::Realm&, Utf16String const&, MediaKeySystemConfiguration, NonnullOwnPtr); [[nodiscard]] Utf16String key_system() const { return m_key_system; } - [[nodiscard]] Bindings::MediaKeySystemConfiguration get_configuration() const { return m_configuration; } + [[nodiscard]] MediaKeySystemConfiguration get_configuration() const { return m_configuration; } protected: - explicit MediaKeySystemAccess(JS::Realm&, Utf16String const&, Bindings::MediaKeySystemConfiguration, NonnullOwnPtr); + explicit MediaKeySystemAccess(JS::Realm&, Utf16String const&, MediaKeySystemConfiguration, NonnullOwnPtr); virtual void initialize(JS::Realm&) override; private: Utf16String m_key_system; - Bindings::MediaKeySystemConfiguration m_configuration; + MediaKeySystemConfiguration m_configuration; NonnullOwnPtr m_cdm_implementation; }; diff --git a/Libraries/LibWeb/EncryptedMediaExtensions/NavigatorEncryptedMediaExtensionsPartial.cpp b/Libraries/LibWeb/EncryptedMediaExtensions/NavigatorEncryptedMediaExtensionsPartial.cpp index 0c422b3bce4..a2d7e5ff719 100644 --- a/Libraries/LibWeb/EncryptedMediaExtensions/NavigatorEncryptedMediaExtensionsPartial.cpp +++ b/Libraries/LibWeb/EncryptedMediaExtensions/NavigatorEncryptedMediaExtensionsPartial.cpp @@ -16,7 +16,7 @@ namespace Web::EncryptedMediaExtensions { // https://w3c.github.io/encrypted-media/#dom-navigator-requestmediakeysystemaccess -WebIDL::ExceptionOr> NavigatorEncryptedMediaExtensionsPartial::request_media_key_system_access(Utf16String key_system, Vector supported_configurations) +WebIDL::ExceptionOr> NavigatorEncryptedMediaExtensionsPartial::request_media_key_system_access(Utf16String key_system, Vector supported_configurations) { auto& navigator = as(*this); auto& realm = navigator.realm(); diff --git a/Libraries/LibWeb/EncryptedMediaExtensions/NavigatorEncryptedMediaExtensionsPartial.h b/Libraries/LibWeb/EncryptedMediaExtensions/NavigatorEncryptedMediaExtensionsPartial.h index 93f8061a5f5..0c442145412 100644 --- a/Libraries/LibWeb/EncryptedMediaExtensions/NavigatorEncryptedMediaExtensionsPartial.h +++ b/Libraries/LibWeb/EncryptedMediaExtensions/NavigatorEncryptedMediaExtensionsPartial.h @@ -15,7 +15,7 @@ namespace Web::EncryptedMediaExtensions { class NavigatorEncryptedMediaExtensionsPartial { public: - WebIDL::ExceptionOr> request_media_key_system_access(Utf16String, Vector); + WebIDL::ExceptionOr> request_media_key_system_access(Utf16String, Vector); private: virtual ~NavigatorEncryptedMediaExtensionsPartial() = default;