diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2017-12-13 00:26:07 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-02-24 10:13:29 +0100 |
| commit | 55d03738f9f79e30bab6294b023176d1a65ab5c3 (patch) | |
| tree | 7642bab700a61a4d0880b1f0773cbd8a9760217a /dom/base/Navigator.cpp | |
| parent | 011dac290a9ea52539754aa64958df204425eb76 (diff) | |
| download | UXP-55d03738f9f79e30bab6294b023176d1a65ab5c3.tar UXP-55d03738f9f79e30bab6294b023176d1a65ab5c3.tar.gz UXP-55d03738f9f79e30bab6294b023176d1a65ab5c3.tar.lz UXP-55d03738f9f79e30bab6294b023176d1a65ab5c3.tar.xz UXP-55d03738f9f79e30bab6294b023176d1a65ab5c3.zip | |
Don't include MediaKeySystemAccess without EME.
This also removes checks for EME content in documents.
This removes practical use of EME by no longer having a keying system. (no-op)
tag #26
Diffstat (limited to 'dom/base/Navigator.cpp')
| -rw-r--r-- | dom/base/Navigator.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/dom/base/Navigator.cpp b/dom/base/Navigator.cpp index 8b20d0196..5c315517c 100644 --- a/dom/base/Navigator.cpp +++ b/dom/base/Navigator.cpp @@ -97,8 +97,10 @@ #endif #include "mozilla/dom/ContentChild.h" +#ifdef MOZ_EME #include "mozilla/EMEUtils.h" #include "mozilla/DetailedPromise.h" +#endif namespace mozilla { namespace dom { @@ -214,7 +216,9 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(Navigator) NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mServiceWorkerContainer) NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mWindow) +#ifdef MOZ_EME NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mMediaKeySystemAccessManager) +#endif NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mPresentation) #ifdef MOZ_GAMEPAD NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mGamepadServiceTest) @@ -288,10 +292,12 @@ Navigator::Invalidate() mServiceWorkerContainer = nullptr; +#ifdef MOZ_EME if (mMediaKeySystemAccessManager) { mMediaKeySystemAccessManager->Shutdown(); mMediaKeySystemAccessManager = nullptr; } +#endif #ifdef MOZ_GAMEPAD if (mGamepadServiceTest) { @@ -1884,6 +1890,7 @@ Navigator::GetUserAgent(nsPIDOMWindowInner* aWindow, nsIURI* aURI, return siteSpecificUA->GetUserAgentForURIAndWindow(aURI, aWindow, aUserAgent); } +#ifdef MOZ_EME static nsCString ToCString(const nsString& aString) { @@ -2009,6 +2016,7 @@ Navigator::RequestMediaKeySystemAccess(const nsAString& aKeySystem, mMediaKeySystemAccessManager->Request(promise, aKeySystem, aConfigs); return promise.forget(); } +#endif Presentation* Navigator::GetPresentation(ErrorResult& aRv) |