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

Side by Side Diff: media/cdm/default_cdm_factory.cc

Issue 985113003: Block platform verification and file IO in the CDM adapter if the CDM configuration disallows them. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix DCHECK types. Created 5 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 | « media/cdm/default_cdm_factory.h ('k') | media/cdm/ppapi/cdm_adapter.h » ('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/cdm/default_cdm_factory.h" 5 #include "media/cdm/default_cdm_factory.h"
6 6
7 #include "media/base/key_systems.h" 7 #include "media/base/key_systems.h"
8 #include "media/cdm/aes_decryptor.h" 8 #include "media/cdm/aes_decryptor.h"
9 9
10 namespace media { 10 namespace media {
11 11
12 DefaultCdmFactory::DefaultCdmFactory() { 12 DefaultCdmFactory::DefaultCdmFactory() {
13 } 13 }
14 14
15 DefaultCdmFactory::~DefaultCdmFactory() { 15 DefaultCdmFactory::~DefaultCdmFactory() {
16 } 16 }
17 17
18 scoped_ptr<MediaKeys> DefaultCdmFactory::Create( 18 scoped_ptr<MediaKeys> DefaultCdmFactory::Create(
19 const std::string& key_system, 19 const std::string& key_system,
20 bool allow_distinctive_identifier,
21 bool allow_persistent_state,
20 const GURL& security_origin, 22 const GURL& security_origin,
21 const SessionMessageCB& session_message_cb, 23 const SessionMessageCB& session_message_cb,
22 const SessionClosedCB& session_closed_cb, 24 const SessionClosedCB& session_closed_cb,
23 const SessionErrorCB& session_error_cb, 25 const SessionErrorCB& session_error_cb,
24 const SessionKeysChangeCB& session_keys_change_cb, 26 const SessionKeysChangeCB& session_keys_change_cb,
25 const SessionExpirationUpdateCB& session_expiration_update_cb) { 27 const SessionExpirationUpdateCB& session_expiration_update_cb) {
26 if (CanUseAesDecryptor(key_system)) { 28 if (CanUseAesDecryptor(key_system)) {
27 return make_scoped_ptr(new AesDecryptor( 29 return make_scoped_ptr(new AesDecryptor(
28 session_message_cb, session_closed_cb, session_keys_change_cb)); 30 session_message_cb, session_closed_cb, session_keys_change_cb));
29 } 31 }
30 32
31 return nullptr; 33 return nullptr;
32 } 34 }
33 35
34 } // namespace media 36 } // namespace media
OLDNEW
« no previous file with comments | « media/cdm/default_cdm_factory.h ('k') | media/cdm/ppapi/cdm_adapter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698