OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 #include "media/blink/key_system_config_selector.h" | 5 #include "media/blink/key_system_config_selector.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
11 #include "base/logging.h" | 11 #include "base/logging.h" |
12 #include "base/strings/string_util.h" | 12 #include "base/strings/string_util.h" |
13 #include "base/strings/utf_string_conversions.h" | 13 #include "base/strings/utf_string_conversions.h" |
14 #include "media/base/cdm_config.h" | 14 #include "media/base/cdm_config.h" |
15 #include "media/base/key_systems.h" | 15 #include "media/base/key_systems.h" |
16 #include "media/base/media_permission.h" | 16 #include "media/base/media_permission.h" |
17 #include "media/base/mime_util.h" | 17 #include "media/base/mime_util.h" |
18 #include "media/blink/webmediaplayer_util.h" | 18 #include "media/blink/webmediaplayer_util.h" |
| 19 #include "third_party/WebKit/public/platform/URLConversion.h" |
19 #include "third_party/WebKit/public/platform/WebMediaKeySystemConfiguration.h" | 20 #include "third_party/WebKit/public/platform/WebMediaKeySystemConfiguration.h" |
20 #include "third_party/WebKit/public/platform/WebSecurityOrigin.h" | 21 #include "third_party/WebKit/public/platform/WebSecurityOrigin.h" |
21 #include "third_party/WebKit/public/platform/WebString.h" | 22 #include "third_party/WebKit/public/platform/WebString.h" |
22 #include "third_party/WebKit/public/platform/WebVector.h" | 23 #include "third_party/WebKit/public/platform/WebVector.h" |
23 #include "url/gurl.h" | 24 #include "url/gurl.h" |
24 | 25 |
25 namespace media { | 26 namespace media { |
26 | 27 |
27 using EmeFeatureRequirement = | 28 using EmeFeatureRequirement = |
28 blink::WebMediaKeySystemConfiguration::Requirement; | 29 blink::WebMediaKeySystemConfiguration::Requirement; |
(...skipping 729 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
758 continue; | 759 continue; |
759 case CONFIGURATION_REQUIRES_PERMISSION: | 760 case CONFIGURATION_REQUIRES_PERMISSION: |
760 if (request->was_permission_requested) { | 761 if (request->was_permission_requested) { |
761 DVLOG(2) << "Rejecting requested configuration because " | 762 DVLOG(2) << "Rejecting requested configuration because " |
762 << "permission was denied."; | 763 << "permission was denied."; |
763 continue; | 764 continue; |
764 } | 765 } |
765 { | 766 { |
766 // Note: the GURL must not be constructed inline because | 767 // Note: the GURL must not be constructed inline because |
767 // base::Passed(&request) sets |request| to null. | 768 // base::Passed(&request) sets |request| to null. |
768 GURL security_origin(request->security_origin.toString()); | 769 GURL security_origin( |
| 770 blink::WebStringToGURL(request->security_origin.toString())); |
769 media_permission_->RequestPermission( | 771 media_permission_->RequestPermission( |
770 MediaPermission::PROTECTED_MEDIA_IDENTIFIER, security_origin, | 772 MediaPermission::PROTECTED_MEDIA_IDENTIFIER, security_origin, |
771 base::Bind(&KeySystemConfigSelector::OnPermissionResult, | 773 base::Bind(&KeySystemConfigSelector::OnPermissionResult, |
772 weak_factory_.GetWeakPtr(), base::Passed(&request))); | 774 weak_factory_.GetWeakPtr(), base::Passed(&request))); |
773 } | 775 } |
774 return; | 776 return; |
775 case CONFIGURATION_SUPPORTED: | 777 case CONFIGURATION_SUPPORTED: |
776 cdm_config.allow_distinctive_identifier = | 778 cdm_config.allow_distinctive_identifier = |
777 (accumulated_configuration.distinctiveIdentifier == | 779 (accumulated_configuration.distinctiveIdentifier == |
778 blink::WebMediaKeySystemConfiguration::Requirement::Required); | 780 blink::WebMediaKeySystemConfiguration::Requirement::Required); |
(...skipping 15 matching lines...) Expand all Loading... |
794 | 796 |
795 void KeySystemConfigSelector::OnPermissionResult( | 797 void KeySystemConfigSelector::OnPermissionResult( |
796 scoped_ptr<SelectionRequest> request, | 798 scoped_ptr<SelectionRequest> request, |
797 bool is_permission_granted) { | 799 bool is_permission_granted) { |
798 request->was_permission_requested = true; | 800 request->was_permission_requested = true; |
799 request->is_permission_granted = is_permission_granted; | 801 request->is_permission_granted = is_permission_granted; |
800 SelectConfigInternal(std::move(request)); | 802 SelectConfigInternal(std::move(request)); |
801 } | 803 } |
802 | 804 |
803 } // namespace media | 805 } // namespace media |
OLD | NEW |