summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2018-02-24 11:37:35 +0100
committerwolfbeast <mcwerewolf@gmail.com>2018-02-24 11:37:35 +0100
commit1dbd9799db37d8491a1ddb2d47e89f40fefd9c63 (patch)
tree643cdfe45e539567a32b60f23ff890dca5f5b64c
parentc88c161875beca091fe183a3b04480422b3d3885 (diff)
downloadUXP-1dbd9799db37d8491a1ddb2d47e89f40fefd9c63.tar
UXP-1dbd9799db37d8491a1ddb2d47e89f40fefd9c63.tar.gz
UXP-1dbd9799db37d8491a1ddb2d47e89f40fefd9c63.tar.lz
UXP-1dbd9799db37d8491a1ddb2d47e89f40fefd9c63.tar.xz
UXP-1dbd9799db37d8491a1ddb2d47e89f40fefd9c63.zip
Fix up leftover merge conflicts.
Tag #26
-rw-r--r--dom/html/HTMLMediaElement.cpp17
-rw-r--r--dom/media/webaudio/AudioContext.cpp2
2 files changed, 3 insertions, 16 deletions
diff --git a/dom/html/HTMLMediaElement.cpp b/dom/html/HTMLMediaElement.cpp
index 09a354c3d..1f1a545fa 100644
--- a/dom/html/HTMLMediaElement.cpp
+++ b/dom/html/HTMLMediaElement.cpp
@@ -1092,13 +1092,9 @@ void HTMLMediaElement::AbortExistingLoads()
mDownloadSuspendedByCache = false;
mMediaInfo = MediaInfo();
mIsEncrypted = false;
-<<<<<<< HEAD
- mPendingEncryptedInitData.mInitDatas.Clear();
-=======
#ifdef MOZ_EME
- mPendingEncryptedInitData.Reset();
+ mPendingEncryptedInitData.mInitDatas.Clear();
#endif
->>>>>>> 8b6178ba9d... Don't build EME-specific subroutines without EME.
mWaitingForKey = NOT_WAITING_FOR_KEY;
mSourcePointer = nullptr;
@@ -4523,12 +4519,8 @@ void HTMLMediaElement::MetadataLoaded(const MediaInfo* aInfo,
for (const auto& initData : mPendingEncryptedInitData.mInitDatas) {
DispatchEncrypted(initData.mInitData, initData.mType);
}
-<<<<<<< HEAD
mPendingEncryptedInitData.mInitDatas.Clear();
-=======
- mPendingEncryptedInitData.Reset();
#endif
->>>>>>> 8b6178ba9d... Don't build EME-specific subroutines without EME.
}
mWatchManager.ManualNotify(&HTMLMediaElement::UpdateReadyStateInternal);
@@ -5465,12 +5457,8 @@ void HTMLMediaElement::SuspendOrResumeElement(bool aPauseElement, bool aSuspendE
ReportEMETelemetry();
#endif
-<<<<<<< HEAD
- // For EME content, force destruction of the CDM client (and CDM
-=======
#ifdef MOZ_EME
// For EME content, we may force destruction of the CDM client (and CDM
->>>>>>> 8b6178ba9d... Don't build EME-specific subroutines without EME.
// instance if this is the last client for that CDM instance) and
// the CDM's decoder. This ensures the CDM gets reliable and prompt
// shutdown notifications, as it may have book-keeping it needs
@@ -5533,8 +5521,6 @@ void HTMLMediaElement::NotifyOwnerDocumentActivityChanged()
bool pauseElement = ShouldElementBePaused();
SuspendOrResumeElement(pauseElement, !IsActive());
-<<<<<<< HEAD
-=======
#ifdef MOZ_EME
// If the owning document has become inactive we should shutdown the CDM.
if (!OwnerDoc()->IsCurrentActiveDocument() && mMediaKeys) {
@@ -5546,7 +5532,6 @@ void HTMLMediaElement::NotifyOwnerDocumentActivityChanged()
}
#endif
->>>>>>> 8b6178ba9d... Don't build EME-specific subroutines without EME.
AddRemoveSelfReference();
}
diff --git a/dom/media/webaudio/AudioContext.cpp b/dom/media/webaudio/AudioContext.cpp
index f61226a48..a36eda621 100644
--- a/dom/media/webaudio/AudioContext.cpp
+++ b/dom/media/webaudio/AudioContext.cpp
@@ -379,10 +379,12 @@ AudioContext::CreateMediaElementSource(HTMLMediaElement& aMediaElement,
return nullptr;
}
+#ifdef MOZ_EME
if (aMediaElement.ContainsRestrictedContent()) {
aRv.Throw(NS_ERROR_DOM_NOT_SUPPORTED_ERR);
return nullptr;
}
+#endif
if (CheckClosed(aRv)) {
return nullptr;