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

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

Issue 2382973002: Convert WebSecurityOrigin -> GURL without re-parsing the url (Closed)
Patch Set: rebase Created 4 years, 2 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
OLDNEW
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/URLConversion.h"
20 #include "third_party/WebKit/public/platform/WebMediaKeySystemConfiguration.h" 20 #include "third_party/WebKit/public/platform/WebMediaKeySystemConfiguration.h"
21 #include "third_party/WebKit/public/platform/WebSecurityOrigin.h" 21 #include "third_party/WebKit/public/platform/WebSecurityOrigin.h"
22 #include "third_party/WebKit/public/platform/WebString.h" 22 #include "third_party/WebKit/public/platform/WebString.h"
23 #include "third_party/WebKit/public/platform/WebVector.h" 23 #include "third_party/WebKit/public/platform/WebVector.h"
24 #include "url/gurl.h" 24 #include "url/gurl.h"
25 #include "url/origin.h"
25 26
26 namespace media { 27 namespace media {
27 28
28 using EmeFeatureRequirement = 29 using EmeFeatureRequirement =
29 blink::WebMediaKeySystemConfiguration::Requirement; 30 blink::WebMediaKeySystemConfiguration::Requirement;
30 31
31 namespace { 32 namespace {
32 33
33 static EmeConfigRule GetSessionTypeConfigRule(EmeSessionTypeSupport support) { 34 static EmeConfigRule GetSessionTypeConfigRule(EmeSessionTypeSupport support) {
34 switch (support) { 35 switch (support) {
(...skipping 853 matching lines...) Expand 10 before | Expand all | Expand 10 after
888 continue; 889 continue;
889 case CONFIGURATION_REQUIRES_PERMISSION: 890 case CONFIGURATION_REQUIRES_PERMISSION:
890 if (request->was_permission_requested) { 891 if (request->was_permission_requested) {
891 DVLOG(2) << "Rejecting requested configuration because " 892 DVLOG(2) << "Rejecting requested configuration because "
892 << "permission was denied."; 893 << "permission was denied.";
893 continue; 894 continue;
894 } 895 }
895 { 896 {
896 // Note: the GURL must not be constructed inline because 897 // Note: the GURL must not be constructed inline because
897 // base::Passed(&request) sets |request| to null. 898 // base::Passed(&request) sets |request| to null.
898 GURL security_origin( 899 GURL security_origin(url::Origin(request->security_origin).GetURL());
899 blink::WebStringToGURL(request->security_origin.toString()));
900 media_permission_->RequestPermission( 900 media_permission_->RequestPermission(
901 MediaPermission::PROTECTED_MEDIA_IDENTIFIER, security_origin, 901 MediaPermission::PROTECTED_MEDIA_IDENTIFIER, security_origin,
902 base::Bind(&KeySystemConfigSelector::OnPermissionResult, 902 base::Bind(&KeySystemConfigSelector::OnPermissionResult,
903 weak_factory_.GetWeakPtr(), base::Passed(&request))); 903 weak_factory_.GetWeakPtr(), base::Passed(&request)));
904 } 904 }
905 return; 905 return;
906 case CONFIGURATION_SUPPORTED: 906 case CONFIGURATION_SUPPORTED:
907 cdm_config.allow_distinctive_identifier = 907 cdm_config.allow_distinctive_identifier =
908 (accumulated_configuration.distinctiveIdentifier == 908 (accumulated_configuration.distinctiveIdentifier ==
909 EmeFeatureRequirement::Required); 909 EmeFeatureRequirement::Required);
(...skipping 14 matching lines...) Expand all
924 924
925 void KeySystemConfigSelector::OnPermissionResult( 925 void KeySystemConfigSelector::OnPermissionResult(
926 std::unique_ptr<SelectionRequest> request, 926 std::unique_ptr<SelectionRequest> request,
927 bool is_permission_granted) { 927 bool is_permission_granted) {
928 request->was_permission_requested = true; 928 request->was_permission_requested = true;
929 request->is_permission_granted = is_permission_granted; 929 request->is_permission_granted = is_permission_granted;
930 SelectConfigInternal(std::move(request)); 930 SelectConfigInternal(std::move(request));
931 } 931 }
932 932
933 } // namespace media 933 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698