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

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 on #427122 Created 4 years, 1 month 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 857 matching lines...) Expand 10 before | Expand all | Expand 10 after
892 continue; 893 continue;
893 case CONFIGURATION_REQUIRES_PERMISSION: 894 case CONFIGURATION_REQUIRES_PERMISSION:
894 if (request->was_permission_requested) { 895 if (request->was_permission_requested) {
895 DVLOG(2) << "Rejecting requested configuration because " 896 DVLOG(2) << "Rejecting requested configuration because "
896 << "permission was denied."; 897 << "permission was denied.";
897 continue; 898 continue;
898 } 899 }
899 { 900 {
900 // Note: the GURL must not be constructed inline because 901 // Note: the GURL must not be constructed inline because
901 // base::Passed(&request) sets |request| to null. 902 // base::Passed(&request) sets |request| to null.
902 GURL security_origin( 903 GURL security_origin(url::Origin(request->security_origin).GetURL());
903 blink::WebStringToGURL(request->security_origin.toString()));
904 media_permission_->RequestPermission( 904 media_permission_->RequestPermission(
905 MediaPermission::PROTECTED_MEDIA_IDENTIFIER, security_origin, 905 MediaPermission::PROTECTED_MEDIA_IDENTIFIER, security_origin,
906 base::Bind(&KeySystemConfigSelector::OnPermissionResult, 906 base::Bind(&KeySystemConfigSelector::OnPermissionResult,
907 weak_factory_.GetWeakPtr(), base::Passed(&request))); 907 weak_factory_.GetWeakPtr(), base::Passed(&request)));
908 } 908 }
909 return; 909 return;
910 case CONFIGURATION_SUPPORTED: 910 case CONFIGURATION_SUPPORTED:
911 cdm_config.allow_distinctive_identifier = 911 cdm_config.allow_distinctive_identifier =
912 (accumulated_configuration.distinctiveIdentifier == 912 (accumulated_configuration.distinctiveIdentifier ==
913 EmeFeatureRequirement::Required); 913 EmeFeatureRequirement::Required);
(...skipping 14 matching lines...) Expand all
928 928
929 void KeySystemConfigSelector::OnPermissionResult( 929 void KeySystemConfigSelector::OnPermissionResult(
930 std::unique_ptr<SelectionRequest> request, 930 std::unique_ptr<SelectionRequest> request,
931 bool is_permission_granted) { 931 bool is_permission_granted) {
932 request->was_permission_requested = true; 932 request->was_permission_requested = true;
933 request->is_permission_granted = is_permission_granted; 933 request->is_permission_granted = is_permission_granted;
934 SelectConfigInternal(std::move(request)); 934 SelectConfigInternal(std::move(request));
935 } 935 }
936 936
937 } // namespace media 937 } // namespace media
OLDNEW
« no previous file with comments | « content/renderer/shared_worker/embedded_shared_worker_stub.cc ('k') | media/blink/webcontentdecryptionmodule_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698