wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1134434 - Fix bustage on a CLOSED TREE - r=bustage

Browse Source
This commit is contained in:
Edwin Flores 2015-03-23 16:44:20 +13:00
parent 111df01373
commit 3b999ebf25
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dom/html/HTMLMediaElement.cpp
View File

@ -3092,7 +3092,9 @@ void HTMLMediaElement::MetadataLoaded(const MediaInfo* aInfo,
return; return;
} }
#ifdef MOZ_EME
DispatchEncrypted(aInfo->mCrypto.mInitData, aInfo->mCrypto.mType); DispatchEncrypted(aInfo->mCrypto.mInitData, aInfo->mCrypto.mType);
#endif
} }
// Expose the tracks to JS directly. // Expose the tracks to JS directly.

4
dom/media/mediasource/MediaSourceReader.cpp
View File

@ -96,6 +96,7 @@ MediaSourceReader::IsWaitingMediaResources()
bool bool
MediaSourceReader::IsWaitingOnCDMResource() MediaSourceReader::IsWaitingOnCDMResource()
{ {
#ifdef MOZ_EME
ReentrantMonitorAutoEnter mon(mDecoder->GetReentrantMonitor()); ReentrantMonitorAutoEnter mon(mDecoder->GetReentrantMonitor());
MOZ_ASSERT(!IsWaitingMediaResources()); MOZ_ASSERT(!IsWaitingMediaResources());
@ -106,6 +107,9 @@ MediaSourceReader::IsWaitingOnCDMResource()
} }
return mInfo.IsEncrypted() && !mCDMProxy; return mInfo.IsEncrypted() && !mCDMProxy;
#else
return false;
#endif
} }
size_t size_t