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

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

Issue 1723753002: Make Document::isSecureContext() work for OOPIFs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more rebase fixups Created 4 years, 9 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 | « content/renderer/render_frame_proxy.cc ('k') | media/blink/webmediaplayer_util.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 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/webencryptedmediaclient_impl.h" 5 #include "media/blink/webencryptedmediaclient_impl.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/metrics/histogram.h" 10 #include "base/metrics/histogram.h"
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 void WebEncryptedMediaClientImpl::requestMediaKeySystemAccess( 99 void WebEncryptedMediaClientImpl::requestMediaKeySystemAccess(
100 blink::WebEncryptedMediaRequest request) { 100 blink::WebEncryptedMediaRequest request) {
101 GetReporter(request.keySystem())->ReportRequested(); 101 GetReporter(request.keySystem())->ReportRequested();
102 102
103 if (GetMediaClient()) { 103 if (GetMediaClient()) {
104 GURL security_origin( 104 GURL security_origin(
105 blink::WebStringToGURL(request.getSecurityOrigin().toString())); 105 blink::WebStringToGURL(request.getSecurityOrigin().toString()));
106 106
107 GetMediaClient()->RecordRapporURL("Media.OriginUrl.EME", security_origin); 107 GetMediaClient()->RecordRapporURL("Media.OriginUrl.EME", security_origin);
108 108
109 blink::WebString error_message; 109 if (!request.getSecurityOrigin().isPotentiallyTrustworthy()) {
110 if (!request.getSecurityOrigin().isPotentiallyTrustworthy(error_message)) {
111 GetMediaClient()->RecordRapporURL("Media.OriginUrl.EME.Insecure", 110 GetMediaClient()->RecordRapporURL("Media.OriginUrl.EME.Insecure",
112 security_origin); 111 security_origin);
113 } 112 }
114 } 113 }
115 114
116 key_system_config_selector_.SelectConfig( 115 key_system_config_selector_.SelectConfig(
117 request.keySystem(), request.supportedConfigurations(), 116 request.keySystem(), request.supportedConfigurations(),
118 request.getSecurityOrigin(), are_secure_codecs_supported_cb_.Run(), 117 request.getSecurityOrigin(), are_secure_codecs_supported_cb_.Run(),
119 base::Bind(&WebEncryptedMediaClientImpl::OnRequestSucceeded, 118 base::Bind(&WebEncryptedMediaClientImpl::OnRequestSucceeded,
120 weak_factory_.GetWeakPtr(), request), 119 weak_factory_.GetWeakPtr(), request),
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 std::string uma_name = GetKeySystemNameForUMA(key_system_ascii); 160 std::string uma_name = GetKeySystemNameForUMA(key_system_ascii);
162 Reporter* reporter = reporters_.get(uma_name); 161 Reporter* reporter = reporters_.get(uma_name);
163 if (!reporter) { 162 if (!reporter) {
164 reporter = new Reporter(uma_name); 163 reporter = new Reporter(uma_name);
165 reporters_.add(uma_name, make_scoped_ptr(reporter)); 164 reporters_.add(uma_name, make_scoped_ptr(reporter));
166 } 165 }
167 return reporter; 166 return reporter;
168 } 167 }
169 168
170 } // namespace media 169 } // namespace media
OLDNEW
« no previous file with comments | « content/renderer/render_frame_proxy.cc ('k') | media/blink/webmediaplayer_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698