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/nsDocument.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/nsDocument.cpp')
| -rw-r--r-- | dom/base/nsDocument.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/dom/base/nsDocument.cpp b/dom/base/nsDocument.cpp index 4926b6c0a..eaea49b02 100644 --- a/dom/base/nsDocument.cpp +++ b/dom/base/nsDocument.cpp @@ -4340,6 +4340,7 @@ nsDocument::SetScopeObject(nsIGlobalObject* aGlobal) } } +#ifdef MOZ_EME static void CheckIfContainsEMEContent(nsISupports* aSupports, void* aContainsEME) { @@ -4363,6 +4364,7 @@ nsDocument::ContainsEMEContent() static_cast<void*>(&containsEME)); return containsEME; } +#endif // MOZ_EME static void CheckIfContainsMSEContent(nsISupports* aSupports, void* aContainsMSE) @@ -8390,11 +8392,13 @@ nsDocument::CanSavePresentation(nsIRequest *aNewRequest) } #endif // MOZ_WEBRTC +#ifdef MOZ_EME // Don't save presentations for documents containing EME content, so that // CDMs reliably shutdown upon user navigation. if (ContainsEMEContent()) { return false; } +#endif // Don't save presentations for documents containing MSE content, to // reduce memory usage. |