Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(56)

Unified Diff: webkit/media/crypto/key_systems_info.cc

Issue 15028015: Conditionally build support for Pepper-based CDMs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Use AppendAscii() where possible. Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webkit/media/crypto/key_systems_info.h ('k') | webkit/media/crypto/key_systems_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/media/crypto/key_systems_info.cc
diff --git a/webkit/media/crypto/key_systems_info.cc b/webkit/media/crypto/key_systems_info.cc
index 8fc2c42fe279e994de669c581412f346a5f6b1d0..afe1abaa3b9e5adf907f25ec804c1823ab37bc13 100644
--- a/webkit/media/crypto/key_systems_info.cc
+++ b/webkit/media/crypto/key_systems_info.cc
@@ -89,16 +89,17 @@ const MediaFormatAndKeySystem kSupportedFormatKeySystemCombinations[] = {
const int kNumSupportedFormatKeySystemCombinations =
arraysize(kSupportedFormatKeySystemCombinations);
-const KeySystemPluginTypePair kKeySystemToPluginTypeMapping[] = {
- // TODO(xhwang): Update this with the real plugin name.
+#if defined(ENABLE_PEPPER_CDMS)
+const KeySystemPepperTypePair kKeySystemToPepperTypeMapping[] = {
{ kExternalClearKeyKeySystem, "application/x-ppapi-clearkey-cdm"},
#if defined(WIDEVINE_CDM_AVAILABLE)
{ kWidevineKeySystem, kWidevineCdmPluginMimeType}
#endif // WIDEVINE_CDM_AVAILABLE
};
-const int kNumKeySystemToPluginTypeMapping =
- arraysize(kKeySystemToPluginTypeMapping);
+const int kNumKeySystemToPepperTypeMapping =
+ arraysize(kKeySystemToPepperTypeMapping);
+#endif // defined(ENABLE_PEPPER_CDMS)
bool IsSystemCompatible(const std::string& key_system) {
#if defined(WIDEVINE_CDM_AVAILABLE) && \
« no previous file with comments | « webkit/media/crypto/key_systems_info.h ('k') | webkit/media/crypto/key_systems_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698