| Index: media/blink/webencryptedmediaclient_impl.h
|
| diff --git a/media/blink/webencryptedmediaclient_impl.h b/media/blink/webencryptedmediaclient_impl.h
|
| index 5a1f3e4a040817b7ccdb8835be21ad466e0cc648..d784a6f4f2e180f04b5b8f5edb2e8c2aae4e77db 100644
|
| --- a/media/blink/webencryptedmediaclient_impl.h
|
| +++ b/media/blink/webencryptedmediaclient_impl.h
|
| @@ -7,6 +7,7 @@
|
|
|
| #include <string>
|
|
|
| +#include "base/callback.h"
|
| #include "base/containers/scoped_ptr_hash_map.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/memory/weak_ptr.h"
|
| @@ -31,8 +32,10 @@ class MediaPermission;
|
| class MEDIA_EXPORT WebEncryptedMediaClientImpl
|
| : public blink::WebEncryptedMediaClient {
|
| public:
|
| - WebEncryptedMediaClientImpl(CdmFactory* cdm_factory,
|
| - MediaPermission* media_permission);
|
| + WebEncryptedMediaClientImpl(
|
| + base::Callback<bool(void)> are_secure_surfaces_supported_cb,
|
| + CdmFactory* cdm_factory,
|
| + MediaPermission* media_permission);
|
| virtual ~WebEncryptedMediaClientImpl();
|
|
|
| // WebEncryptedMediaClient implementation.
|
| @@ -58,7 +61,8 @@ class MEDIA_EXPORT WebEncryptedMediaClientImpl
|
| // accumulated configuration.
|
| void OnRequestSucceeded(
|
| blink::WebEncryptedMediaRequest request,
|
| - const blink::WebMediaKeySystemConfiguration& accumulated_configuration);
|
| + const blink::WebMediaKeySystemConfiguration& accumulated_configuration,
|
| + bool are_secure_surfaces_required);
|
|
|
| // Complete a requestMediaKeySystemAccess() request with an error message.
|
| void OnRequestNotSupported(blink::WebEncryptedMediaRequest request,
|
| @@ -71,6 +75,7 @@ class MEDIA_EXPORT WebEncryptedMediaClientImpl
|
| // Reporter singletons.
|
| base::ScopedPtrHashMap<std::string, scoped_ptr<Reporter>> reporters_;
|
|
|
| + base::Callback<bool(void)> are_secure_surfaces_supported_cb_;
|
| CdmFactory* cdm_factory_;
|
| KeySystemConfigSelector key_system_config_selector_;
|
| base::WeakPtrFactory<WebEncryptedMediaClientImpl> weak_factory_;
|
|
|