Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-20 16:55:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1256186 - Part 1: Show 'Enable EME' notification box only when MediaKeys requested for supported keysystem. r=jwwang

Browse Source 
MozReview-Commit-ID: CxJbgzNKGJQ
This commit is contained in:
Kilik Kuo 2016-04-01 18:34:13 +08:00
parent 167f12adec
commit 517dc21177
1 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
dom/media/eme/MediaKeySystemAccessManager.cpp
View File

@ -79,9 +79,21 @@ MediaKeySystemAccessManager::Request(DetailedPromise* aPromise,
RequestType aType)
{
EME_LOG("MediaKeySystemAccessManager::Request %s", NS_ConvertUTF16toUTF8(aKeySystem).get());
// Parse keysystem, split it out into keySystem prefix, and version suffix.
nsAutoString keySystem;
int32_t minCdmVersion = NO_CDM_VERSION;
if (!ParseKeySystem(aKeySystem, keySystem, minCdmVersion)) {
// Not to inform user, because nothing to do if the keySystem is not
// supported.
aPromise->MaybeReject(NS_ERROR_DOM_NOT_SUPPORTED_ERR,
NS_LITERAL_CSTRING("Key system string is invalid,"
" or key system is unsupported"));
return;
}
if (!Preferences::GetBool("media.eme.enabled", false)) {
// EME disabled by user, send notification to chrome so UI can
// inform user.
// EME disabled by user, send notification to chrome so UI can inform user.
MediaKeySystemAccess::NotifyObservers(mWindow,
aKeySystem,
MediaKeySystemStatus::Api_disabled);
@ -90,20 +102,6 @@ MediaKeySystemAccessManager::Request(DetailedPromise* aPromise,
return;
}
// Parse keysystem, split it out into keySystem prefix, and version suffix.
nsAutoString keySystem;
int32_t minCdmVersion = NO_CDM_VERSION;
if (!ParseKeySystem(aKeySystem,
keySystem,
minCdmVersion)) {
// Invalid keySystem string, or unsupported keySystem. Send notification
// to chrome to show a failure notice.
MediaKeySystemAccess::NotifyObservers(mWindow, aKeySystem, MediaKeySystemStatus::Cdm_not_supported);
aPromise->MaybeReject(NS_ERROR_DOM_NOT_SUPPORTED_ERR,
NS_LITERAL_CSTRING("Key system string is invalid, or key system is unsupported"));
return;
}
nsAutoCString message;
nsAutoCString cdmVersion;
MediaKeySystemStatus status =
@ -168,9 +166,10 @@ MediaKeySystemAccessManager::Request(DetailedPromise* aPromise,
aPromise->MaybeResolve(access);
return;
}
// Not to inform user, because nothing to do if the corresponding keySystem
// configuration is not supported.
aPromise->MaybeReject(NS_ERROR_DOM_NOT_SUPPORTED_ERR,
NS_LITERAL_CSTRING("Key system is not supported"));
NS_LITERAL_CSTRING("Key system configuration is not supported"));
}
MediaKeySystemAccessManager::PendingRequest::PendingRequest(DetailedPromise* aPromise,