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

Side by Side Diff: media/blink/key_system_config_selector.h

Issue 1124863005: Restrict use of hardware-secure codecs based on the RendererPreference. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@setsecurity
Patch Set: Correct unittests. Created 5 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 unified diff | Download patch
« no previous file with comments | « media/base/key_systems.cc ('k') | media/blink/key_system_config_selector.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 MEDIA_BLINK_KEY_SYSTEM_CONFIG_SELECTOR_H_ 5 #ifndef MEDIA_BLINK_KEY_SYSTEM_CONFIG_SELECTOR_H_
6 #define MEDIA_BLINK_KEY_SYSTEM_CONFIG_SELECTOR_H_ 6 #define MEDIA_BLINK_KEY_SYSTEM_CONFIG_SELECTOR_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/bind.h" 11 #include "base/bind.h"
12 #include "base/callback.h"
12 #include "base/memory/scoped_ptr.h" 13 #include "base/memory/scoped_ptr.h"
13 #include "base/memory/weak_ptr.h" 14 #include "base/memory/weak_ptr.h"
14 #include "media/base/eme_constants.h" 15 #include "media/base/eme_constants.h"
15 #include "media/base/media_export.h" 16 #include "media/base/media_export.h"
16 #include "third_party/WebKit/public/platform/WebVector.h" 17 #include "third_party/WebKit/public/platform/WebVector.h"
17 18
18 namespace blink { 19 namespace blink {
19 20
20 struct WebMediaKeySystemConfiguration; 21 struct WebMediaKeySystemConfiguration;
21 struct WebMediaKeySystemMediaCapability; 22 struct WebMediaKeySystemMediaCapability;
22 class WebSecurityOrigin; 23 class WebSecurityOrigin;
23 class WebString; 24 class WebString;
24 25
25 } // namespace blink 26 } // namespace blink
26 27
27 namespace media { 28 namespace media {
28 29
29 class KeySystems; 30 class KeySystems;
30 class MediaPermission; 31 class MediaPermission;
31 32
32 class MEDIA_EXPORT KeySystemConfigSelector { 33 class MEDIA_EXPORT KeySystemConfigSelector {
33 public: 34 public:
34 KeySystemConfigSelector(const KeySystems* key_systems, 35 KeySystemConfigSelector(
35 MediaPermission* media_permission); 36 const KeySystems* key_systems,
37 MediaPermission* media_permission);
36 38
37 ~KeySystemConfigSelector(); 39 ~KeySystemConfigSelector();
38 40
39 void SelectConfig( 41 void SelectConfig(
40 const blink::WebString& key_system, 42 const blink::WebString& key_system,
41 const blink::WebVector<blink::WebMediaKeySystemConfiguration>& 43 const blink::WebVector<blink::WebMediaKeySystemConfiguration>&
42 candidate_configurations, 44 candidate_configurations,
43 const blink::WebSecurityOrigin& security_origin, 45 const blink::WebSecurityOrigin& security_origin,
44 base::Callback<void(const blink::WebMediaKeySystemConfiguration&)> 46 bool are_secure_codecs_supported,
45 succeeded_cb, 47 // The second argument is |are_secure_codecs_required|.
48 base::Callback<void(const blink::WebMediaKeySystemConfiguration&,
49 bool)> succeeded_cb,
46 base::Callback<void(const blink::WebString&)> not_supported_cb); 50 base::Callback<void(const blink::WebString&)> not_supported_cb);
47 51
48 private: 52 private:
49 struct SelectionRequest; 53 struct SelectionRequest;
50 class ConfigState; 54 class ConfigState;
51 55
52 enum ConfigurationSupport { 56 enum ConfigurationSupport {
53 CONFIGURATION_NOT_SUPPORTED, 57 CONFIGURATION_NOT_SUPPORTED,
54 CONFIGURATION_REQUIRES_PERMISSION, 58 CONFIGURATION_REQUIRES_PERMISSION,
55 CONFIGURATION_SUPPORTED, 59 CONFIGURATION_SUPPORTED,
(...skipping 28 matching lines...) Expand all
84 const KeySystems* key_systems_; 88 const KeySystems* key_systems_;
85 MediaPermission* media_permission_; 89 MediaPermission* media_permission_;
86 base::WeakPtrFactory<KeySystemConfigSelector> weak_factory_; 90 base::WeakPtrFactory<KeySystemConfigSelector> weak_factory_;
87 91
88 DISALLOW_COPY_AND_ASSIGN(KeySystemConfigSelector); 92 DISALLOW_COPY_AND_ASSIGN(KeySystemConfigSelector);
89 }; 93 };
90 94
91 } // namespace media 95 } // namespace media
92 96
93 #endif // MEDIA_BLINK_KEY_SYSTEM_CONFIG_SELECTOR_H_ 97 #endif // MEDIA_BLINK_KEY_SYSTEM_CONFIG_SELECTOR_H_
OLDNEW
« no previous file with comments | « media/base/key_systems.cc ('k') | media/blink/key_system_config_selector.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698