diff options
Diffstat (limited to 'dom/html/HTMLMediaElement.h')
-rw-r--r-- | dom/html/HTMLMediaElement.h | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/dom/html/HTMLMediaElement.h b/dom/html/HTMLMediaElement.h index bda9924a6f..23799b574c 100644 --- a/dom/html/HTMLMediaElement.h +++ b/dom/html/HTMLMediaElement.h @@ -18,9 +18,6 @@ #include "mozilla/dom/TextTrackManager.h" #include "mozilla/WeakPtr.h" #include "MediaDecoder.h" -#ifdef MOZ_EME -#include "mozilla/dom/MediaKeys.h" -#endif #include "mozilla/StateWatching.h" #include "nsGkAtoms.h" #include "PrincipalChangeObserver.h" @@ -616,30 +613,6 @@ public: // XPCOM MozPreservesPitch() is OK -#ifdef MOZ_EME - MediaKeys* GetMediaKeys() const; - - already_AddRefed<Promise> SetMediaKeys(MediaKeys* mediaKeys, - ErrorResult& aRv); - - mozilla::dom::EventHandlerNonNull* GetOnencrypted(); - void SetOnencrypted(mozilla::dom::EventHandlerNonNull* aCallback); - - mozilla::dom::EventHandlerNonNull* GetOnwaitingforkey(); - void SetOnwaitingforkey(mozilla::dom::EventHandlerNonNull* aCallback); - - void DispatchEncrypted(const nsTArray<uint8_t>& aInitData, - const nsAString& aInitDataType) override; - - bool IsEventAttributeName(nsIAtom* aName) override; - - // Returns the principal of the "top level" document; the origin displayed - // in the URL bar of the browser window. - already_AddRefed<nsIPrincipal> GetTopLevelPrincipal(); - - bool ContainsRestrictedContent(); -#endif // MOZ_EME - void CannotDecryptWaitingForKey(); bool MozAutoplayEnabled() const @@ -1474,11 +1447,6 @@ protected: // Timer used for updating progress events. nsCOMPtr<nsITimer> mProgressTimer; -#ifdef MOZ_EME - // Encrypted Media Extension media keys. - RefPtr<MediaKeys> mMediaKeys; -#endif - // Stores the time at the start of the current 'played' range. double mCurrentPlayRangeStart; @@ -1632,11 +1600,6 @@ protected: // Listens for waitingForKey events from the owned decoder. MediaEventListener mWaitingForKeyListener; -#ifdef MOZ_EME - // Init Data that needs to be sent in 'encrypted' events in MetadataLoaded(). - EncryptionInfo mPendingEncryptedInitData; -#endif - // True if the media's channel's download has been suspended. Watchable<bool> mDownloadSuspendedByCache; |