wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-08 00:07:30 +09:00
Code Issues Projects Releases Packages Wiki Activity

Fix up leftover merge conflicts.

Browse source 
Tag #26
This commit is contained in:
wolfbeast 2018-02-24 11:37:35 +01:00 • committed by Roy Tam
commit b16f7b73d9
2 changed files with 3 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

17
dom/html/HTMLMediaElement.cpp
View file

@ -1092,13 +1092,9 @@ void HTMLMediaElement::AbortExistingLoads()
mDownloadSuspendedByCache = false; mDownloadSuspendedByCache = false;
mMediaInfo = MediaInfo(); mMediaInfo = MediaInfo();
mIsEncrypted = false; mIsEncrypted = false;
<<<<<<< HEAD
mPendingEncryptedInitData.mInitDatas.Clear();
=======
#ifdef MOZ_EME #ifdef MOZ_EME
mPendingEncryptedInitData.Reset(); mPendingEncryptedInitData.mInitDatas.Clear();
#endif #endif
>>>>>>> 8b6178ba9d... Don't build EME-specific subroutines without EME.
mWaitingForKey = NOT_WAITING_FOR_KEY; mWaitingForKey = NOT_WAITING_FOR_KEY;
mSourcePointer = nullptr; mSourcePointer = nullptr;
@ -4523,12 +4519,8 @@ void HTMLMediaElement::MetadataLoaded(const MediaInfo* aInfo,
for (const auto& initData : mPendingEncryptedInitData.mInitDatas) { for (const auto& initData : mPendingEncryptedInitData.mInitDatas) {
DispatchEncrypted(initData.mInitData, initData.mType); DispatchEncrypted(initData.mInitData, initData.mType);
} }
<<<<<<< HEAD
mPendingEncryptedInitData.mInitDatas.Clear(); mPendingEncryptedInitData.mInitDatas.Clear();
=======
mPendingEncryptedInitData.Reset();
#endif #endif
>>>>>>> 8b6178ba9d... Don't build EME-specific subroutines without EME.
} }
mWatchManager.ManualNotify(&HTMLMediaElement::UpdateReadyStateInternal); mWatchManager.ManualNotify(&HTMLMediaElement::UpdateReadyStateInternal);
@ -5465,12 +5457,8 @@ void HTMLMediaElement::SuspendOrResumeElement(bool aPauseElement, bool aSuspendE
ReportEMETelemetry(); ReportEMETelemetry();
#endif #endif
<<<<<<< HEAD
// For EME content, force destruction of the CDM client (and CDM
=======
#ifdef MOZ_EME #ifdef MOZ_EME
// For EME content, we may force destruction of the CDM client (and CDM // 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 // instance if this is the last client for that CDM instance) and
// the CDM's decoder. This ensures the CDM gets reliable and prompt // the CDM's decoder. This ensures the CDM gets reliable and prompt
// shutdown notifications, as it may have book-keeping it needs // shutdown notifications, as it may have book-keeping it needs
@ -5533,8 +5521,6 @@ void HTMLMediaElement::NotifyOwnerDocumentActivityChanged()
bool pauseElement = ShouldElementBePaused(); bool pauseElement = ShouldElementBePaused();
SuspendOrResumeElement(pauseElement, !IsActive()); SuspendOrResumeElement(pauseElement, !IsActive());
<<<<<<< HEAD
=======
#ifdef MOZ_EME #ifdef MOZ_EME
// If the owning document has become inactive we should shutdown the CDM. // If the owning document has become inactive we should shutdown the CDM.
if (!OwnerDoc()->IsCurrentActiveDocument() && mMediaKeys) { if (!OwnerDoc()->IsCurrentActiveDocument() && mMediaKeys) {
@ -5546,7 +5532,6 @@ void HTMLMediaElement::NotifyOwnerDocumentActivityChanged()
} }
#endif #endif
>>>>>>> 8b6178ba9d... Don't build EME-specific subroutines without EME.
AddRemoveSelfReference(); AddRemoveSelfReference();
} }

2
dom/media/webaudio/AudioContext.cpp
View file

@ -379,10 +379,12 @@ AudioContext::CreateMediaElementSource(HTMLMediaElement& aMediaElement,
return nullptr; return nullptr;
} }
#ifdef MOZ_EME
if (aMediaElement.ContainsRestrictedContent()) { if (aMediaElement.ContainsRestrictedContent()) {
aRv.Throw(NS_ERROR_DOM_NOT_SUPPORTED_ERR); aRv.Throw(NS_ERROR_DOM_NOT_SUPPORTED_ERR);
return nullptr; return nullptr;
} }
#endif
if (CheckClosed(aRv)) { if (CheckClosed(aRv)) {
return nullptr; return nullptr;