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

Side by Side Diff: webkit/renderer/media/crypto/key_systems_info.h

Issue 16917014: Revert "Allow suppressed EME canPlayType() responses to be overridden with a flag." (r208096). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef WEBKIT_RENDERER_MEDIA_CRYPTO_KEY_SYSTEMS_INFO_H_ 5 #ifndef WEBKIT_RENDERER_MEDIA_CRYPTO_KEY_SYSTEMS_INFO_H_
6 #define WEBKIT_RENDERER_MEDIA_CRYPTO_KEY_SYSTEMS_INFO_H_ 6 #define WEBKIT_RENDERER_MEDIA_CRYPTO_KEY_SYSTEMS_INFO_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 48
49 #if defined(OS_ANDROID) 49 #if defined(OS_ANDROID)
50 // Mapping from key system to UUID, one entry per key system. 50 // Mapping from key system to UUID, one entry per key system.
51 extern const KeySystemUUIDPair kKeySystemToUUIDMapping[]; 51 extern const KeySystemUUIDPair kKeySystemToUUIDMapping[];
52 extern const int kNumKeySystemToUUIDMapping; 52 extern const int kNumKeySystemToUUIDMapping;
53 #endif // defined(OS_ANDROID) 53 #endif // defined(OS_ANDROID)
54 54
55 // Returns whether |key_system| is compatible with the user's system. 55 // Returns whether |key_system| is compatible with the user's system.
56 bool IsSystemCompatible(const std::string& key_system); 56 bool IsSystemCompatible(const std::string& key_system);
57 57
58 // Returns true if canPlayType should return an empty string for |key_system|.
59 bool IsCanPlayTypeSuppressed(const std::string& key_system);
60
61 // Returns the name that UMA will use for the given |key_system|. 58 // Returns the name that UMA will use for the given |key_system|.
62 // This function can be called frequently. Hence this function should be 59 // This function can be called frequently. Hence this function should be
63 // implemented not to impact performance. 60 // implemented not to impact performance.
64 std::string KeySystemNameForUMAGeneric(const std::string& key_system); 61 std::string KeySystemNameForUMAGeneric(const std::string& key_system);
65 62
66 // Returns whether built-in AesDecryptor can be used for the given |key_system|. 63 // Returns whether built-in AesDecryptor can be used for the given |key_system|.
67 bool CanUseBuiltInAesDecryptor(const std::string& key_system); 64 bool CanUseBuiltInAesDecryptor(const std::string& key_system);
68 65
69 } // namespace webkit_media 66 } // namespace webkit_media
70 67
71 #endif // WEBKIT_RENDERER_MEDIA_CRYPTO_KEY_SYSTEMS_INFO_H_ 68 #endif // WEBKIT_RENDERER_MEDIA_CRYPTO_KEY_SYSTEMS_INFO_H_
OLDNEW
« no previous file with comments | « webkit/renderer/media/crypto/key_systems.cc ('k') | webkit/renderer/media/crypto/key_systems_info.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698